<!doctype html>
<html lang="ru" data-bs-theme="dark">

<head>
    <!-- 2024-05-11 14:15:13 -->
        <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
    <title>git merge-tree</title>
        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.3/css/bootstrap.min.css" integrity="sha512-jnSuA4Ss2PkkikSOLtYs8BlYIeeIK1h99ty4YfvRPAlzr377vr3CXDb7sb7eEEBYjDtcYj+AjBH3FLv5uSJuXg==" crossorigin="anonymous" referrerpolicy="no-referrer" />
    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-icons/1.11.3/font/bootstrap-icons.min.css" integrity="sha512-dPXYcDub/aeb08c63jRq/k6GaKccl256JQy/AnOq7CAnEZ9FzSL9wSbcZkMp4R26vBsMLFYH4kQ67/bbV8XaCQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.9.0/styles/github-dark.min.css" integrity="sha512-rO+olRTkcf304DQBxSWxln8JXCzTHlKnIdnMUwYvQa9/Jd4cQaNkItIUj6Z4nvW1dqK0SKXLbn9h4KwZTNtAyw==" crossorigin="anonymous" referrerpolicy="no-referrer" />
    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/flag-icon-css/7.1.0/css/flag-icons.min.css" integrity="sha512-bZBu2H0+FGFz/stDN/L0k8J0G8qVsAL0ht1qg5kTwtAheiXwiRKyCq1frwfbSFSJN3jooR5kauE0YjtPzhZtJQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
    <link href="../../../runebook.css" rel="stylesheet" type="text/css">
    <meta name="x-github" content="https://github.com/runebookdev/runebook">
            <meta name="x-i18n-doc" content="git">
        <script>
        function i18n(element) {
            // NOP
        }
    </script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/js-cookie/3.0.5/js.cookie.js" integrity="sha512-F/dia2jKME12jwqiYDayeD+Rr/8jTWUD2wfbuJB0bzSwenSEnXsn4qQ/wVyXUCix5bmCAj8xJdtFr2OqUtjLAw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.1/jquery.min.js" integrity="sha512-v2CJ7UaYy4JwqLDIrZUI/4hqeoQieOmAZNXBeQyjo21dadnwR+8ZaIJVT8EE2iyI61OV8e6M8PP2/4hpQINQ/g==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.3/js/bootstrap.bundle.min.js" integrity="sha512-7Pi/otdlbbCR+LnW+F7PwFcSDJOuUJB3OxtEHbg4vSMvzvJjde4Po1v4BR9Gdc9aXNUNFVUY+SK51wWT8WF0Gg==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/rxjs/7.8.1/rxjs.umd.min.js" integrity="sha512-D9LDs8YUUVa4V9Gl4Zb+xqRAc7RCzooR3+zzebgK2RMu/KU+dh90pbjEEMzPiSyRSGbSp9j1pZnrO4joGa5WEg==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/mark.js/8.11.1/jquery.mark.min.js" integrity="sha512-mhbv5DqBMgrWL+32MmsDOt/OAvqr/cHimk6B8y/bx/xS88MVkYGPiVv2ixKVrkywF2qHplNRUvFsAHUdxZ3Krg==" crossorigin="anonymous"></script>
    <script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=ca-pub-6424571640879890" crossorigin="anonymous"></script>    <script async src="https://www.googletagmanager.com/gtag/js?id=G-3G5BZ1QEDP"></script>
<script>
    window.dataLayer = window.dataLayer || [];

    function gtag() {
        dataLayer.push(arguments);
    }

    gtag('js', new Date());
    gtag('config', 'G-3G5BZ1QEDP');
</script>    <script>
(function(c, l, a, r, i, t, y) {
    c[a] = c[a] || function() {
        (c[a].q = c[a].q || []).push(arguments)
    };
    t = l.createElement(r);
    t.async = 1;
    t.src = "https://www.clarity.ms/tag/" + i + "?ref=bwt";
    y = l.getElementsByTagName(r)[0];
    y.parentNode.insertBefore(t, y);
})(window, document, "clarity", "script", "jto2hd94r9");
</script>    <script src="../../../theme.js"></script>
</head>

<body>
    <header class="bg-black">
        <div class="container">
            <div class="row">
                <div class="col">
                    <nav class="navbar navbar-expand-lg navbar-dark">
                        <a class="navbar-brand fw-bold" href="https://runebook.dev/ru">
                            <img alt="Runebook.dev" class="d-inline-block align-top mr-1" src="../../../assets/runebook_logo.webp" width="24" height="24">
                            Runebook.dev
                        </a>
                        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
                            <span class="navbar-toggler-icon"></span>
                        </button>
                        <div class="collapse navbar-collapse" id="navbarSupportedContent">
                            <ul class="navbar-nav me-auto mb-2 mb-lg-0">
                                <li class="nav-item">
                                    <a class="nav-link" href="https://runebook.dev/ru#docs">Documentation</a>
                                </li>
                                <li class="nav-item">
                                    <a class="nav-link" href="https://runebook.dev/contributors">Contributors</a>
                                </li>
                                <li class="nav-item">
                                    <a class="nav-link" href="https://github.com/runebookdev/runebook/issues">GitHub</a>
                                </li>
                            </ul>
                                                                                                <button class="btn btn-success ms-2" id="showPopupButton">
                                        <i class="bi bi-translate"></i>
                                        Show English
                                    </button>
                                                                                        <div class="form-check form-switch ms-3">
                                <label class="text-light">
                                    <input class="form-check-input" type="checkbox" role="switch" id="theme-switch" checked>
                                    <i class="bi bi-moon-stars-fill"></i>
                                </label>
                            </div>
                        </div>
                    </nav>
                </div>
            </div>
        </div>
    </header>

    <!--sse-->
    <div class="container">
    <div class="row">
        <div class="col">
            <nav aria-label="breadcrumb" class="mt-2">
                <ol class="breadcrumb mb-1">
                    <li class="breadcrumb-item">
                        <a href="https://runebook.dev/ru#docs">
                            <span class="fi fi-ru"></span>                            Русский                        </a>
                    </li>
                    <li class="breadcrumb-item">
                        <a href="-index-.html">
                            Git                            2.43                        </a>
                    </li>
                                            <li class="breadcrumb-item">
                            <a href="-index-.html#Git">
                                Git                            </a>
                        </li>
                                    </ol>
            </nav>
        </div>
    </div>
    <br>

    <div class="row">
        <div class="col-md-9">
            <main>
                <article>

                    
                    <h1 class="text-body-emphasis" ><span data-i18n="6780ab38353aac1cad55e68c394baebe919b3bce6c7bcf25e4df17b95256f18b/62" data-source="git-merge-tree" onmousemove="i18n(this)">git-merge-tree</span></h1> <h2 class="text-body-emphasis"  id="_name"><span data-i18n="dcd1d5223f73b3a965c07e3ff5dbee3eedcfedb806686a05b9b3868a2c3d6d50/3a" data-source="Name" onmousemove="i18n(this)">Name</span></h2> <div> <p><span data-i18n="6124b9ba11874749955b3d4ebe93274801d728f5112490b4cf426968ae5de1ab/69" data-source="git-merge-tree - Perform merge without touching index or working tree" onmousemove="i18n(this)">git-merge-tree &mdash; &vcy;&ycy;&pcy;&ocy;&lcy;&ncy;&icy;&tcy;&softcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&iecy;, &ncy;&iecy; &kcy;&acy;&scy;&acy;&yacy;&scy;&softcy; &icy;&ncy;&dcy;&iecy;&kcy;&scy;&acy; &icy;&lcy;&icy; &rcy;&acy;&bcy;&ocy;&chcy;&iecy;&gcy;&ocy; &dcy;&iecy;&rcy;&iecy;&vcy;&acy;.</span></p> </div> <h2 class="text-body-emphasis"  id="_synopsis"><span data-i18n="8eb3755381519d7f0479d75446e56e20084834c0460d7ec94926932372ea6c47/0d" data-source="Synopsis" onmousemove="i18n(this)">Synopsis</span></h2> <div> <div> <pre class="hljs language-xml">git merge-tree [--write-tree] [<span class="hljs-tag">&lt;<span class="hljs-name">options</span>&gt;</span>] <span class="hljs-tag">&lt;<span class="hljs-name">branch1</span>&gt;</span> <span class="hljs-tag">&lt;<span class="hljs-name">branch2</span>&gt;</span>
git merge-tree [--trivial-merge] <span class="hljs-tag">&lt;<span class="hljs-name">base-tree</span>&gt;</span> <span class="hljs-tag">&lt;<span class="hljs-name">branch1</span>&gt;</span> <span class="hljs-tag">&lt;<span class="hljs-name">branch2</span>&gt;</span> (deprecated)</pre> </div> </div> <h2 class="text-body-emphasis"  id="NEWMERGE"><span data-i18n="526e0087cc3f254d9f86f6c7d8e23d954c4dfda2b312efc29194ae8a860106ba/d3" data-source="Description" onmousemove="i18n(this)">Description</span></h2> <div> <p><span data-i18n="3209050e958746b08a11040d4f2b31f75244262f90e6e89740184a0ec1251c88/2a" data-source="This command has a modern &lt;code&gt;--write-tree&lt;/code&gt; mode and a deprecated &lt;code&gt;--trivial-merge&lt;/code&gt; mode. With the exception of the &lt;a href=&quot;#DEPMERGE&quot;&gt;DEPRECATED DESCRIPTION&lt;/a&gt; section at the end, the rest of this documentation describes the modern &lt;code&gt;--write-tree&lt;/code&gt; mode." onmousemove="i18n(this)">&Ecy;&tcy;&acy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&acy; &icy;&mcy;&iecy;&iecy;&tcy; &scy;&ocy;&vcy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ycy;&jcy; &rcy;&iecy;&zhcy;&icy;&mcy;  <code>--write-tree</code>  &icy; &ucy;&scy;&tcy;&acy;&rcy;&iecy;&vcy;&shcy;&icy;&jcy; &rcy;&iecy;&zhcy;&icy;&mcy;  <code>--trivial-merge</code> . &Zcy;&acy; &icy;&scy;&kcy;&lcy;&yucy;&chcy;&iecy;&ncy;&icy;&iecy;&mcy; &rcy;&acy;&zcy;&dcy;&iecy;&lcy;&acy;  <a href="git-merge-tree.html#DEPMERGE">DEPRECATED DESCRIPTION</a>  &vcy; &kcy;&ocy;&ncy;&tscy;&iecy;, &ocy;&scy;&tcy;&acy;&lcy;&softcy;&ncy;&acy;&yacy; &chcy;&acy;&scy;&tcy;&softcy; &dcy;&ocy;&kcy;&ucy;&mcy;&iecy;&ncy;&tcy;&acy;&tscy;&icy;&icy; &ocy;&pcy;&icy;&scy;&ycy;&vcy;&acy;&iecy;&tcy; &scy;&ocy;&vcy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ycy;&jcy; &rcy;&iecy;&zhcy;&icy;&mcy;  <code>--write-tree</code> .</span></p> <p><span data-i18n="890e061957cf166ac034f40386885dcd3104ca0eee1e5030e05ddfb65c41edb8/67" data-source="Performs a merge, but does not make any new commits and does not read from or write to either the working tree or index." onmousemove="i18n(this)">&Vcy;&ycy;&pcy;&ocy;&lcy;&ncy;&yacy;&iecy;&tcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&iecy;, &ncy;&ocy; &ncy;&iecy; &dcy;&iecy;&lcy;&acy;&iecy;&tcy; &ncy;&ocy;&vcy;&ycy;&khcy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&jcy; &icy; &ncy;&iecy; &chcy;&icy;&tcy;&acy;&iecy;&tcy; &icy; &ncy;&iecy; &zcy;&acy;&pcy;&icy;&scy;&ycy;&vcy;&acy;&iecy;&tcy; &ncy;&icy; &vcy; &rcy;&acy;&bcy;&ocy;&chcy;&iecy;&iecy; &dcy;&iecy;&rcy;&iecy;&vcy;&ocy;, &ncy;&icy; &vcy; &icy;&ncy;&dcy;&iecy;&kcy;&scy;.</span></p> <p><span data-i18n="450d880c77a8318b036701a6578ae19ca3d99cc0c8dac103e88127029b7049ae/5e" data-source="The performed merge will use the same features as the &amp;quot;real&amp;quot; &lt;a href=&quot;git-merge&quot;&gt;git-merge[1]&lt;/a&gt;, including:" onmousemove="i18n(this)">&Vcy;&ycy;&pcy;&ocy;&lcy;&ncy;&iecy;&ncy;&ncy;&ocy;&iecy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&iecy;&ncy;&icy;&iecy; &bcy;&ucy;&dcy;&iecy;&tcy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy; &tcy;&iecy; &zhcy;&iecy; &fcy;&ucy;&ncy;&kcy;&tscy;&icy;&icy;, &chcy;&tcy;&ocy; &icy;  &quot;real&quot;   <a href="git-merge.html">git-merge[1]</a> , &vcy; &tcy;&ocy;&mcy; &chcy;&icy;&scy;&lcy;&iecy;:</span></p> <div> <ul> <li> <p><span data-i18n="5d17a351da6f3849c391d35323c2cb89ea1ca6a5ecf48188c0c152f694ec5d89/5b" data-source="three way content merges of individual files" onmousemove="i18n(this)">&tcy;&rcy;&iecy;&khcy;&scy;&tcy;&ocy;&rcy;&ocy;&ncy;&ncy;&iecy;&iecy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&iecy;&ncy;&icy;&iecy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ocy;&gcy;&ocy; &ocy;&tcy;&dcy;&iecy;&lcy;&softcy;&ncy;&ycy;&khcy; &fcy;&acy;&jcy;&lcy;&ocy;&vcy;</span></p> </li> <li> <p><span data-i18n="ac347d58cc697aba74e617214e80e0fd3192abe66362c9deff13ca7cb2b086a2/9b" data-source="rename detection" onmousemove="i18n(this)">rename detection</span></p> </li> <li> <p><span data-i18n="13171c2138326f6665ac316be22ec39a6351f0d73b1a8e25ff250f4b604ca1c2/5f" data-source="proper directory/file conflict handling" onmousemove="i18n(this)">&pcy;&rcy;&acy;&vcy;&icy;&lcy;&softcy;&ncy;&acy;&yacy; &ocy;&bcy;&rcy;&acy;&bcy;&ocy;&tcy;&kcy;&acy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ocy;&vcy; &kcy;&acy;&tcy;&acy;&lcy;&ocy;&gcy;&ocy;&vcy;/&fcy;&acy;&jcy;&lcy;&ocy;&vcy;</span></p> </li> <li> <p><span data-i18n="29f1059d943c2c6dec165f1b524f648c40e26f328fce725a6dddfa7febbd0cd2/5c" data-source="recursive ancestor consolidation (i.e. when there is more than one merge base, creating a virtual merge base by merging the merge bases)" onmousemove="i18n(this)">&rcy;&iecy;&kcy;&ucy;&rcy;&scy;&icy;&vcy;&ncy;&acy;&yacy; &kcy;&ocy;&ncy;&scy;&ocy;&lcy;&icy;&dcy;&acy;&tscy;&icy;&yacy; &pcy;&rcy;&iecy;&dcy;&kcy;&ocy;&vcy; (&tcy;. &iecy;. &pcy;&rcy;&icy; &ncy;&acy;&lcy;&icy;&chcy;&icy;&icy; &bcy;&ocy;&lcy;&iecy;&iecy; &ocy;&dcy;&ncy;&ocy;&jcy; &bcy;&acy;&zcy;&ycy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &scy;&ocy;&zcy;&dcy;&acy;&ncy;&icy;&iecy; &vcy;&icy;&rcy;&tcy;&ucy;&acy;&lcy;&softcy;&ncy;&ocy;&jcy; &bcy;&acy;&zcy;&ycy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &pcy;&ucy;&tcy;&iecy;&mcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &bcy;&acy;&zcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;)</span></p> </li> <li> <p><span data-i18n="41b387a9617d9ffde9dc713bb94531bfc48d834db2fdc78d61c2040332d7bd35/7b" data-source="etc." onmousemove="i18n(this)">etc.</span></p> </li> </ul> </div> <p><span data-i18n="321a87298b2a4c7c96cd97b82d464d7ba53a4d27220b3d606874530493b24fb0/41" data-source="After the merge completes, a new toplevel tree object is created. See &lt;code&gt;OUTPUT&lt;/code&gt; below for details." onmousemove="i18n(this)">&Pcy;&ocy;&scy;&lcy;&iecy; &zcy;&acy;&vcy;&iecy;&rcy;&shcy;&iecy;&ncy;&icy;&yacy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &scy;&ocy;&zcy;&dcy;&acy;&iecy;&tcy;&scy;&yacy; &ncy;&ocy;&vcy;&ycy;&jcy; &ocy;&bcy;&hardcy;&iecy;&kcy;&tcy; &dcy;&iecy;&rcy;&iecy;&vcy;&acy; &vcy;&iecy;&rcy;&khcy;&ncy;&iecy;&gcy;&ocy; &ucy;&rcy;&ocy;&vcy;&ncy;&yacy;. &Pcy;&ocy;&dcy;&rcy;&ocy;&bcy;&ncy;&ocy;&scy;&tcy;&icy; &scy;&mcy;. &vcy;  <code>OUTPUT</code>  &ncy;&icy;&zhcy;&iecy;.</span></p> </div> <h2 class="text-body-emphasis"  id="_options"><span data-i18n="d0db8b5e364b6989e4b8f38a2b3846b87d99a51c1592ebf35d21cc66405a8e39/b6" data-source="Options" onmousemove="i18n(this)">Options</span></h2> <div> <div> <dl> <dt id="Documentation/git-merge-tree.txt--z"><span data-i18n="cac3c371c8f2e17e79214e0fae22255e0f1fad169bac56d2f8a10d7fd54846cb/4d" data-source="-z" onmousemove="i18n(this)">-z</span></dt> <dd> <p><span data-i18n="48ce9fa3cc84134d7ae5bf5904ac390c96b23e663498914911b21c1558a791c2/62" data-source="Do not quote filenames in the &amp;lt;Conflicted file info&amp;gt; section, and end each filename with a NUL character rather than newline. Also begin the messages section with a NUL character instead of a newline. See &lt;a href=&quot;#OUTPUT&quot;&gt;OUTPUT&lt;/a&gt; below for more information." onmousemove="i18n(this)">&Ncy;&iecy; &zcy;&acy;&kcy;&lcy;&yucy;&chcy;&acy;&jcy;&tcy;&iecy; &icy;&mcy;&iecy;&ncy;&acy; &fcy;&acy;&jcy;&lcy;&ocy;&vcy; &vcy; &kcy;&acy;&vcy;&ycy;&chcy;&kcy;&icy; &vcy; &rcy;&acy;&zcy;&dcy;&iecy;&lcy;&iecy; &lt;&Icy;&ncy;&fcy;&ocy;&rcy;&mcy;&acy;&tscy;&icy;&yacy; &ocy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ucy;&yucy;&shchcy;&iecy;&mcy; &fcy;&acy;&jcy;&lcy;&iecy;&gt; &icy; &zcy;&acy;&kcy;&acy;&ncy;&chcy;&icy;&vcy;&acy;&jcy;&tcy;&iecy; &kcy;&acy;&zhcy;&dcy;&ocy;&iecy; &icy;&mcy;&yacy; &fcy;&acy;&jcy;&lcy;&acy; &scy;&icy;&mcy;&vcy;&ocy;&lcy;&ocy;&mcy; NUL, &acy; &ncy;&iecy; &scy;&icy;&mcy;&vcy;&ocy;&lcy;&ocy;&mcy; &ncy;&ocy;&vcy;&ocy;&jcy; &scy;&tcy;&rcy;&ocy;&kcy;&icy;. &Tcy;&acy;&kcy;&zhcy;&iecy; &ncy;&acy;&chcy;&ncy;&icy;&tcy;&iecy; &rcy;&acy;&zcy;&dcy;&iecy;&lcy; &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&jcy; &scy; &scy;&icy;&mcy;&vcy;&ocy;&lcy;&acy; NUL &vcy;&mcy;&iecy;&scy;&tcy;&ocy; &ncy;&ocy;&vcy;&ocy;&jcy; &scy;&tcy;&rcy;&ocy;&kcy;&icy;. &Dcy;&lcy;&yacy; &pcy;&ocy;&lcy;&ucy;&chcy;&iecy;&ncy;&icy;&yacy; &dcy;&ocy;&pcy;&ocy;&lcy;&ncy;&icy;&tcy;&iecy;&lcy;&softcy;&ncy;&ocy;&jcy; &icy;&ncy;&fcy;&ocy;&rcy;&mcy;&acy;&tscy;&icy;&icy; &scy;&mcy;.  <a href="git-merge-tree.html#OUTPUT">OUTPUT</a>  &ncy;&icy;&zhcy;&iecy;.</span></p> </dd> <dt id="Documentation/git-merge-tree.txt---name-only"><span data-i18n="d365c3a369d47879148ac4de53dc2b93a87ec4a61961daf205bf06c642280fcc/91" data-source="--name-only" onmousemove="i18n(this)">--name-only</span></dt> <dd> <p><span data-i18n="a7db5d706264213045684f954620f7b52fd536a5905db250c86ccd16ab98186d/76" data-source="In the Conflicted file info section, instead of writing a list of (mode, oid, stage, path) tuples to output for conflicted files, just provide a list of filenames with conflicts (and do not list filenames multiple times if they have multiple conflicting stages)." onmousemove="i18n(this)">&Vcy; &rcy;&acy;&zcy;&dcy;&iecy;&lcy;&iecy; &laquo;&Icy;&ncy;&fcy;&ocy;&rcy;&mcy;&acy;&tscy;&icy;&yacy; &ocy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ucy;&yucy;&shchcy;&iecy;&mcy; &fcy;&acy;&jcy;&lcy;&iecy;&raquo; &vcy;&mcy;&iecy;&scy;&tcy;&ocy; &zcy;&acy;&pcy;&icy;&scy;&icy; &scy;&pcy;&icy;&scy;&kcy;&acy; &kcy;&ocy;&rcy;&tcy;&iecy;&zhcy;&iecy;&jcy; (&rcy;&iecy;&zhcy;&icy;&mcy;, oid, &scy;&tcy;&acy;&dcy;&icy;&yacy;, &pcy;&ucy;&tcy;&softcy;) &dcy;&lcy;&yacy; &vcy;&ycy;&vcy;&ocy;&dcy;&acy; &dcy;&lcy;&yacy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ucy;&yucy;&shchcy;&icy;&khcy; &fcy;&acy;&jcy;&lcy;&ocy;&vcy; &pcy;&rcy;&ocy;&scy;&tcy;&ocy; &ucy;&kcy;&acy;&zhcy;&icy;&tcy;&iecy; &scy;&pcy;&icy;&scy;&ocy;&kcy; &icy;&mcy;&iecy;&ncy; &fcy;&acy;&jcy;&lcy;&ocy;&vcy; &scy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&acy;&mcy;&icy; (&icy; &ncy;&iecy; &pcy;&iecy;&rcy;&iecy;&chcy;&icy;&scy;&lcy;&yacy;&jcy;&tcy;&iecy; &icy;&mcy;&iecy;&ncy;&acy; &fcy;&acy;&jcy;&lcy;&ocy;&vcy; &ncy;&iecy;&scy;&kcy;&ocy;&lcy;&softcy;&kcy;&ocy; &rcy;&acy;&zcy;, &iecy;&scy;&lcy;&icy; &ucy; &ncy;&icy;&khcy; &iecy;&scy;&tcy;&softcy; &ncy;&iecy;&scy;&kcy;&ocy;&lcy;&softcy;&kcy;&ocy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ucy;&yucy;&shchcy;&icy;&khcy; &fcy;&acy;&jcy;&lcy;&ocy;&vcy;). &ecy;&tcy;&acy;&pcy;&ycy;).</span></p> </dd> <dt id="Documentation/git-merge-tree.txt---no-messages"><span data-i18n="ccd866e415756f77f46a4d95feed750494b991d40c1bdec461ae0bdf84a47e3a/a3" data-source="--[no-]messages" onmousemove="i18n(this)">--[no-]messages</span></dt> <dd> <p><span data-i18n="2d35b067fd9caa71a72d7e8c082d9f6bf7b4028c7940f170039a9ca448b2eccb/f6" data-source="Write any informational messages such as &amp;quot;Auto-merging &amp;lt;path&amp;gt;&amp;quot; or CONFLICT notices to the end of stdout. If unspecified, the default is to include these messages if there are merge conflicts, and to omit them otherwise." onmousemove="i18n(this)">&Zcy;&acy;&pcy;&icy;&shcy;&icy;&tcy;&iecy; &lcy;&yucy;&bcy;&ycy;&iecy; &icy;&ncy;&fcy;&ocy;&rcy;&mcy;&acy;&tscy;&icy;&ocy;&ncy;&ncy;&ycy;&iecy; &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&yacy;, &tcy;&acy;&kcy;&icy;&iecy; &kcy;&acy;&kcy;  &quot;Auto-merging &lt;path&gt;&quot;  &icy;&lcy;&icy; &ucy;&vcy;&iecy;&dcy;&ocy;&mcy;&lcy;&iecy;&ncy;&icy;&yacy; &ocy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&iecy;, &vcy; &kcy;&ocy;&ncy;&iecy;&tscy; &scy;&tcy;&acy;&ncy;&dcy;&acy;&rcy;&tcy;&ncy;&ocy;&gcy;&ocy; &vcy;&ycy;&vcy;&ocy;&dcy;&acy;. &IEcy;&scy;&lcy;&icy; &ncy;&iecy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;&ocy;, &pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy; &ecy;&tcy;&icy; &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&yacy; &vcy;&kcy;&lcy;&yucy;&chcy;&acy;&yucy;&tcy;&scy;&yacy; &vcy; &scy;&lcy;&ucy;&chcy;&acy;&iecy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ocy;&vcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &icy; &ocy;&pcy;&ucy;&scy;&kcy;&acy;&yucy;&tcy;&scy;&yacy; &vcy; &pcy;&rcy;&ocy;&tcy;&icy;&vcy;&ncy;&ocy;&mcy; &scy;&lcy;&ucy;&chcy;&acy;&iecy;.</span></p> </dd> <dt id="Documentation/git-merge-tree.txt---allow-unrelated-histories"><span data-i18n="99401a7cada550ce79e0f82bee3a3a5c1163a445ef1e788fdff5ac9755eab349/71" data-source="--allow-unrelated-histories" onmousemove="i18n(this)">--allow-unrelated-histories</span></dt> <dd> <p><span data-i18n="efdbb782a10d74081781e854de5e0383b049cb3c8fd28686620ca6a7ee18bc2a/d0" data-source="merge-tree will by default error out if the two branches specified share no common history. This flag can be given to override that check and make the merge proceed anyway." onmousemove="i18n(this)">merge-tree &pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy; &vcy;&ycy;&dcy;&acy;&scy;&tcy; &ocy;&shcy;&icy;&bcy;&kcy;&ucy;, &iecy;&scy;&lcy;&icy; &dcy;&vcy;&iecy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;&ncy;&ycy;&iecy; &vcy;&iecy;&tcy;&kcy;&icy; &ncy;&iecy; &icy;&mcy;&iecy;&yucy;&tcy; &ocy;&bcy;&shchcy;&iecy;&jcy; &icy;&scy;&tcy;&ocy;&rcy;&icy;&icy;. &Ecy;&tcy;&ocy;&tcy; &fcy;&lcy;&acy;&gcy; &mcy;&ocy;&zhcy;&iecy;&tcy; &bcy;&ycy;&tcy;&softcy; &zcy;&acy;&dcy;&acy;&ncy; &dcy;&lcy;&yacy; &ocy;&tcy;&mcy;&iecy;&ncy;&ycy; &ecy;&tcy;&ocy;&jcy; &pcy;&rcy;&ocy;&vcy;&iecy;&rcy;&kcy;&icy; &icy; &pcy;&rcy;&ocy;&dcy;&ocy;&lcy;&zhcy;&iecy;&ncy;&icy;&yacy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &vcy; &lcy;&yucy;&bcy;&ocy;&mcy; &scy;&lcy;&ucy;&chcy;&acy;&iecy;.</span></p> </dd> <dt id="Documentation/git-merge-tree.txt---merge-baseltcommitgt"><span data-i18n="324bd94067a7498b49ef328cea737d5b43968325146946dc9b8330bf1a75e813/e4" data-source="--merge-base=&amp;lt;commit&amp;gt;" onmousemove="i18n(this)">--merge-base=&lt;commit&gt;</span></dt> <dd> <p><span data-i18n="6dc0f6db75ded0aaa0d760d01523d2f908ff4141f9c5f22d75190e8c40209632/57" data-source="Instead of finding the merge-bases for &amp;lt;branch1&amp;gt; and &amp;lt;branch2&amp;gt;, specify a merge-base for the merge, and specifying multiple bases is currently not supported. This option is incompatible with &lt;code&gt;--stdin&lt;/code&gt;." onmousemove="i18n(this)">&Vcy;&mcy;&iecy;&scy;&tcy;&ocy; &pcy;&ocy;&icy;&scy;&kcy;&acy; &bcy;&acy;&zcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &dcy;&lcy;&yacy; &lt;branch1&gt; &icy; &lt;branch2&gt; &ucy;&kcy;&acy;&zhcy;&icy;&tcy;&iecy; &bcy;&acy;&zcy;&ucy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &dcy;&lcy;&yacy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;, &acy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;&icy;&iecy; &ncy;&iecy;&scy;&kcy;&ocy;&lcy;&softcy;&kcy;&icy;&khcy; &bcy;&acy;&zcy; &vcy; &ncy;&acy;&scy;&tcy;&ocy;&yacy;&shchcy;&iecy;&iecy; &vcy;&rcy;&iecy;&mcy;&yacy; &ncy;&iecy; &pcy;&ocy;&dcy;&dcy;&iecy;&rcy;&zhcy;&icy;&vcy;&acy;&iecy;&tcy;&scy;&yacy;. &Ecy;&tcy;&acy; &ocy;&pcy;&tscy;&icy;&yacy; &ncy;&iecy;&scy;&ocy;&vcy;&mcy;&iecy;&scy;&tcy;&icy;&mcy;&acy; &scy;  <code>--stdin</code> .</span></p> </dd> </dl> </div> </div> <h2 class="text-body-emphasis"  id="OUTPUT"><span data-i18n="b2439bcb8dee14b685f137f294b0e0cb62f5aadf45143ce01d79777d435a93b4/6b" data-source="Output" onmousemove="i18n(this)">Output</span></h2> <div> <p><span data-i18n="b22e6c343bd640834b7424271ed6b4c0155eba2b029cfb5c860a28159ffb381c/17" data-source="For a successful merge, the output from git-merge-tree is simply one line:" onmousemove="i18n(this)">&Dcy;&lcy;&yacy; &ucy;&scy;&pcy;&iecy;&shcy;&ncy;&ocy;&gcy;&ocy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &vcy;&ycy;&vcy;&ocy;&dcy; git-merge-tree &pcy;&rcy;&iecy;&dcy;&scy;&tcy;&acy;&vcy;&lcy;&yacy;&iecy;&tcy; &scy;&ocy;&bcy;&ocy;&jcy; &pcy;&rcy;&ocy;&scy;&tcy;&ocy; &ocy;&dcy;&ncy;&ucy; &scy;&tcy;&rcy;&ocy;&kcy;&ucy;:</span></p> <div> <div> <pre class="hljs language-xml"><span class="hljs-tag">&lt;<span class="hljs-name">OID</span> <span class="hljs-attr">of</span> <span class="hljs-attr">toplevel</span> <span class="hljs-attr">tree</span>&gt;</span></pre> </div> </div> <p><span data-i18n="e9de24eaf7283c37662d093c209297f23044587dece1ed79c128cec5f66d5276/a9" data-source="Whereas for a conflicted merge, the output is by default of the form:" onmousemove="i18n(this)">&Vcy; &tcy;&ocy; &vcy;&rcy;&iecy;&mcy;&yacy; &kcy;&acy;&kcy; &vcy; &scy;&lcy;&ucy;&chcy;&acy;&iecy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ncy;&ocy;&gcy;&ocy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &vcy;&ycy;&khcy;&ocy;&dcy;&ncy;&ycy;&iecy; &dcy;&acy;&ncy;&ncy;&ycy;&iecy; &pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy; &icy;&mcy;&iecy;&yucy;&tcy; &vcy;&icy;&dcy;:</span></p> <div> <div> <pre class="hljs language-xml"><span class="hljs-tag">&lt;<span class="hljs-name">OID</span> <span class="hljs-attr">of</span> <span class="hljs-attr">toplevel</span> <span class="hljs-attr">tree</span>&gt;</span>
<span class="hljs-tag">&lt;<span class="hljs-name">Conflicted</span> <span class="hljs-attr">file</span> <span class="hljs-attr">info</span>&gt;</span>
<span class="hljs-tag">&lt;<span class="hljs-name">Informational</span> <span class="hljs-attr">messages</span>&gt;</span></pre> </div> </div> <p><span data-i18n="10411fd837a9f38d4dd46b30bea244832b74570f912b8dbf39594828a1292bfe/a7" data-source="These are discussed individually below." onmousemove="i18n(this)">&Ocy;&ncy;&icy; &ocy;&bcy;&scy;&ucy;&zhcy;&dcy;&acy;&yucy;&tcy;&scy;&yacy; &icy;&ncy;&dcy;&icy;&vcy;&icy;&dcy;&ucy;&acy;&lcy;&softcy;&ncy;&ocy; &ncy;&icy;&zhcy;&iecy;.</span></p> <p><span data-i18n="20d7abffd1a168fa5d0a332a9d0c016caa015df7e94ee17c490f892ed60eac0d/aa" data-source="However, there is an exception. If &lt;code&gt;--stdin&lt;/code&gt; is passed, then there is an extra section at the beginning, a NUL character at the end, and then all the sections repeat for each line of input. Thus, if the first merge is conflicted and the second is clean, the output would be of the form:" onmousemove="i18n(this)">&Ocy;&dcy;&ncy;&acy;&kcy;&ocy; &iecy;&scy;&tcy;&softcy; &icy;&scy;&kcy;&lcy;&yucy;&chcy;&iecy;&ncy;&icy;&iecy;. &IEcy;&scy;&lcy;&icy; &pcy;&iecy;&rcy;&iecy;&dcy;&acy;&ncy;  <code>--stdin</code> , &tcy;&ocy; &vcy; &ncy;&acy;&chcy;&acy;&lcy;&iecy; &pcy;&ocy;&yacy;&vcy;&lcy;&yacy;&iecy;&tcy;&scy;&yacy; &dcy;&ocy;&pcy;&ocy;&lcy;&ncy;&icy;&tcy;&iecy;&lcy;&softcy;&ncy;&ycy;&jcy; &rcy;&acy;&zcy;&dcy;&iecy;&lcy;, &vcy; &kcy;&ocy;&ncy;&tscy;&iecy; &mdash; &scy;&icy;&mcy;&vcy;&ocy;&lcy; NUL, &acy; &zcy;&acy;&tcy;&iecy;&mcy; &vcy;&scy;&iecy; &rcy;&acy;&zcy;&dcy;&iecy;&lcy;&ycy; &pcy;&ocy;&vcy;&tcy;&ocy;&rcy;&yacy;&yucy;&tcy;&scy;&yacy; &dcy;&lcy;&yacy; &kcy;&acy;&zhcy;&dcy;&ocy;&jcy; &scy;&tcy;&rcy;&ocy;&kcy;&icy; &vcy;&vcy;&ocy;&dcy;&acy;. &Tcy;&acy;&kcy;&icy;&mcy; &ocy;&bcy;&rcy;&acy;&zcy;&ocy;&mcy;, &iecy;&scy;&lcy;&icy; &pcy;&iecy;&rcy;&vcy;&ocy;&iecy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&iecy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ncy;&ocy;&iecy;, &acy; &vcy;&tcy;&ocy;&rcy;&ocy;&iecy; &chcy;&icy;&scy;&tcy;&ocy;&iecy;, &vcy;&ycy;&khcy;&ocy;&dcy;&ncy;&ycy;&iecy; &dcy;&acy;&ncy;&ncy;&ycy;&iecy; &bcy;&ucy;&dcy;&ucy;&tcy; &icy;&mcy;&iecy;&tcy;&softcy; &vcy;&icy;&dcy;:</span></p> <div> <div> <pre class="hljs language-xml"><span class="hljs-tag">&lt;<span class="hljs-name">Merge</span> <span class="hljs-attr">status</span>&gt;</span>
<span class="hljs-tag">&lt;<span class="hljs-name">OID</span> <span class="hljs-attr">of</span> <span class="hljs-attr">toplevel</span> <span class="hljs-attr">tree</span>&gt;</span>
<span class="hljs-tag">&lt;<span class="hljs-name">Conflicted</span> <span class="hljs-attr">file</span> <span class="hljs-attr">info</span>&gt;</span>
<span class="hljs-tag">&lt;<span class="hljs-name">Informational</span> <span class="hljs-attr">messages</span>&gt;</span>
NUL
<span class="hljs-tag">&lt;<span class="hljs-name">Merge</span> <span class="hljs-attr">status</span>&gt;</span>
<span class="hljs-tag">&lt;<span class="hljs-name">OID</span> <span class="hljs-attr">of</span> <span class="hljs-attr">toplevel</span> <span class="hljs-attr">tree</span>&gt;</span>
NUL</pre> </div> </div> <div> <h3 class="text-body-emphasis"  id="MS"><span data-i18n="4306136659bbf1afebdd698e0178fcf47e36484c8a12980fce5000307ca76f72/ac" data-source="Merge status" onmousemove="i18n(this)">Merge status</span></h3> <p><span data-i18n="834f6b8d6f52f38bcf75a9f040affebaaafbb02c13f65c261631e5601ac0b3ce/b2" data-source="This is an integer status followed by a NUL character. The integer status is:" onmousemove="i18n(this)">&Ecy;&tcy;&ocy; &tscy;&iecy;&lcy;&ocy;&iecy; &chcy;&icy;&scy;&lcy;&ocy;, &zcy;&acy; &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&mcy; &scy;&lcy;&iecy;&dcy;&ucy;&iecy;&tcy; &scy;&icy;&mcy;&vcy;&ocy;&lcy; NUL. &TScy;&iecy;&lcy;&ocy;&chcy;&icy;&scy;&lcy;&iecy;&ncy;&ncy;&ycy;&jcy; &scy;&tcy;&acy;&tcy;&ucy;&scy;:</span></p> <div> <div> <pre class="hljs language-sql">   <span class="hljs-number">0</span>: <span class="hljs-keyword">merge</span> had conflicts
   <span class="hljs-number">1</span>: <span class="hljs-keyword">merge</span> was clean
   <span class="hljs-operator">&lt;</span><span class="hljs-number">0</span>: something prevented the <span class="hljs-keyword">merge</span> <span class="hljs-keyword">from</span> <span class="hljs-keyword">running</span> (e.g. access <span class="hljs-keyword">to</span> repository
objects denied <span class="hljs-keyword">by</span> filesystem)</pre> </div> </div> </div> <div> <h3 class="text-body-emphasis"  id="OIDTLT"><span data-i18n="74a90d0c0f6e0719db57ab0e870b4d2c0c1cacaab645d390c61526a3a7eb89cf/fb" data-source="OID of toplevel tree" onmousemove="i18n(this)">OID &dcy;&iecy;&rcy;&iecy;&vcy;&acy; &vcy;&iecy;&rcy;&khcy;&ncy;&iecy;&gcy;&ocy; &ucy;&rcy;&ocy;&vcy;&ncy;&yacy;</span></h3> <p><span data-i18n="8774bf59e2d1ece48e89e0772e1b49ff900853846d013f1d12692be96f00b21c/76" data-source="This is a tree object that represents what would be checked out in the working tree at the end of &lt;code&gt;git merge&lt;/code&gt;. If there were conflicts, then files within this tree may have embedded conflict markers. This section is always followed by a newline (or NUL if &lt;code&gt;-z&lt;/code&gt; is passed)." onmousemove="i18n(this)">&Ecy;&tcy;&ocy; &ocy;&bcy;&hardcy;&iecy;&kcy;&tcy; &dcy;&iecy;&rcy;&iecy;&vcy;&acy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&jcy; &pcy;&rcy;&iecy;&dcy;&scy;&tcy;&acy;&vcy;&lcy;&yacy;&iecy;&tcy; &tcy;&ocy;, &chcy;&tcy;&ocy; &bcy;&ucy;&dcy;&iecy;&tcy; &icy;&zcy;&vcy;&lcy;&iecy;&chcy;&iecy;&ncy;&ocy; &icy;&zcy; &rcy;&acy;&bcy;&ocy;&chcy;&iecy;&gcy;&ocy; &dcy;&iecy;&rcy;&iecy;&vcy;&acy; &vcy; &kcy;&ocy;&ncy;&tscy;&iecy;  <code>git merge</code> . &IEcy;&scy;&lcy;&icy; &bcy;&ycy;&lcy;&icy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ycy;, &tcy;&ocy; &fcy;&acy;&jcy;&lcy;&ycy; &vcy; &ecy;&tcy;&ocy;&mcy; &dcy;&iecy;&rcy;&iecy;&vcy;&iecy; &mcy;&ocy;&gcy;&ucy;&tcy; &icy;&mcy;&iecy;&tcy;&softcy; &vcy;&scy;&tcy;&rcy;&ocy;&iecy;&ncy;&ncy;&ycy;&iecy; &mcy;&acy;&rcy;&kcy;&iecy;&rcy;&ycy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&acy;. &Zcy;&acy; &ecy;&tcy;&icy;&mcy; &rcy;&acy;&zcy;&dcy;&iecy;&lcy;&ocy;&mcy; &vcy;&scy;&iecy;&gcy;&dcy;&acy; &scy;&lcy;&iecy;&dcy;&ucy;&iecy;&tcy; &ncy;&ocy;&vcy;&acy;&yacy; &scy;&tcy;&rcy;&ocy;&kcy;&acy; (&icy;&lcy;&icy; NUL, &iecy;&scy;&lcy;&icy; &pcy;&iecy;&rcy;&iecy;&dcy;&acy;&ncy;  <code>-z</code> ).</span></p> </div> <div> <h3 class="text-body-emphasis"  id="CFI"><span data-i18n="6dab0e4f6a08f7fd17dfaf83b4ad84abf1b5666573fee14d880333ff5719c624/8c" data-source="Conflicted file info" onmousemove="i18n(this)">&Kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy; &icy;&ncy;&fcy;&ocy;&rcy;&mcy;&acy;&tscy;&icy;&icy; &ocy; &fcy;&acy;&jcy;&lcy;&iecy;</span></h3> <p><span data-i18n="c2a60569befb562a52727dbfc6b9fcfe163eb4659b873775cdab17548bbf2c87/7a" data-source="This is a sequence of lines with the format" onmousemove="i18n(this)">&Ecy;&tcy;&ocy; &pcy;&ocy;&scy;&lcy;&iecy;&dcy;&ocy;&vcy;&acy;&tcy;&iecy;&lcy;&softcy;&ncy;&ocy;&scy;&tcy;&softcy; &scy;&tcy;&rcy;&ocy;&kcy; &fcy;&ocy;&rcy;&mcy;&acy;&tcy;&acy;</span></p> <div> <div> <pre class="hljs language-xml"><span class="hljs-tag">&lt;<span class="hljs-name">mode</span>&gt;</span> <span class="hljs-tag">&lt;<span class="hljs-name">object</span>&gt;</span> <span class="hljs-tag">&lt;<span class="hljs-name">stage</span>&gt;</span> <span class="hljs-tag">&lt;<span class="hljs-name">filename</span>&gt;</span></pre> </div> </div> <p><span data-i18n="3a0e9cae96e433cc7bc6b74cdc7414839fcec3fca556bd67b387697425066588/da" data-source="The filename will be quoted as explained for the configuration variable &lt;code&gt;core.quotePath&lt;/code&gt; (see &lt;a href=&quot;git-config&quot;&gt;git-config[1]&lt;/a&gt;). However, if the &lt;code&gt;--name-only&lt;/code&gt; option is passed, the mode, object, and stage will be omitted. If &lt;code&gt;-z&lt;/code&gt; is passed, the &amp;quot;lines&amp;quot; are terminated by a NUL character instead of a newline character." onmousemove="i18n(this)">&Icy;&mcy;&yacy; &fcy;&acy;&jcy;&lcy;&acy; &bcy;&ucy;&dcy;&iecy;&tcy; &zcy;&acy;&kcy;&lcy;&yucy;&chcy;&iecy;&ncy;&ocy; &vcy; &kcy;&acy;&vcy;&ycy;&chcy;&kcy;&icy;, &kcy;&acy;&kcy; &ocy;&pcy;&icy;&scy;&acy;&ncy;&ocy; &dcy;&lcy;&yacy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ocy;&jcy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy;  <code>core.quotePath</code>  (&scy;&mcy;.  <a href="git-config.html">git-config[1]</a> ). &Ocy;&dcy;&ncy;&acy;&kcy;&ocy; &iecy;&scy;&lcy;&icy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;&acy; &ocy;&pcy;&tscy;&icy;&yacy;  <code>--name-only</code> , &rcy;&iecy;&zhcy;&icy;&mcy;, &ocy;&bcy;&hardcy;&iecy;&kcy;&tcy; &icy; &scy;&tcy;&acy;&dcy;&icy;&yacy; &bcy;&ucy;&dcy;&ucy;&tcy; &ocy;&pcy;&ucy;&shchcy;&iecy;&ncy;&ycy;. &IEcy;&scy;&lcy;&icy; &pcy;&iecy;&rcy;&iecy;&dcy;&acy;&iecy;&tcy;&scy;&yacy;  <code>-z</code> ,  &quot;lines&quot;  &zcy;&acy;&vcy;&iecy;&rcy;&shcy;&acy;&iecy;&tcy;&scy;&yacy; &scy;&icy;&mcy;&vcy;&ocy;&lcy;&ocy;&mcy; NUL &vcy;&mcy;&iecy;&scy;&tcy;&ocy; &scy;&icy;&mcy;&vcy;&ocy;&lcy;&acy; &ncy;&ocy;&vcy;&ocy;&jcy; &scy;&tcy;&rcy;&ocy;&kcy;&icy;.</span></p> </div> <div> <h3 class="text-body-emphasis"  id="IM"><span data-i18n="ed6eca81ad17c4f34d8aeef3de8ae3752530939b50baaddff0e71b6e472deed5/c2" data-source="Informational messages" onmousemove="i18n(this)">Informational messages</span></h3> <p><span data-i18n="5c8bb85fd8ff6179186b5b5ee73a4b9a157a706f2d5ee38b34dcdca8c1bee847/34" data-source="This section provides informational messages, typically about conflicts. The format of the section varies significantly depending on whether &lt;code&gt;-z&lt;/code&gt; is passed." onmousemove="i18n(this)">&Vcy; &ecy;&tcy;&ocy;&mcy; &rcy;&acy;&zcy;&dcy;&iecy;&lcy;&iecy; &pcy;&rcy;&iecy;&dcy;&scy;&tcy;&acy;&vcy;&lcy;&iecy;&ncy;&ycy; &icy;&ncy;&fcy;&ocy;&rcy;&mcy;&acy;&tscy;&icy;&ocy;&ncy;&ncy;&ycy;&iecy; &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&yacy;, &ocy;&bcy;&ycy;&chcy;&ncy;&ocy; &ocy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&acy;&khcy;. &Fcy;&ocy;&rcy;&mcy;&acy;&tcy; &rcy;&acy;&zcy;&dcy;&iecy;&lcy;&acy; &scy;&ucy;&shchcy;&iecy;&scy;&tcy;&vcy;&iecy;&ncy;&ncy;&ocy; &mcy;&iecy;&ncy;&yacy;&iecy;&tcy;&scy;&yacy; &vcy; &zcy;&acy;&vcy;&icy;&scy;&icy;&mcy;&ocy;&scy;&tcy;&icy; &ocy;&tcy; &tcy;&ocy;&gcy;&ocy;, &pcy;&rcy;&ocy;&pcy;&ucy;&shchcy;&iecy;&ncy; &lcy;&icy;  <code>-z</code> .</span></p> <p><span data-i18n="c5ca1569d965d4f37c37d6be83dd4ea065ae45f45bfff386f768c7bc8eb4cb00/c9" data-source="If &lt;code&gt;-z&lt;/code&gt; is passed:" onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &pcy;&iecy;&rcy;&iecy;&dcy;&acy;&ncy;  <code>-z</code> :</span></p> <p><span data-i18n="90e8d38fe456c7c0ba6789e899e2ae96164374acb19385bdf5225357178c7046/be" data-source="The output format is zero or more conflict informational records, each of the form:" onmousemove="i18n(this)">&Vcy;&ycy;&khcy;&ocy;&dcy;&ncy;&ocy;&jcy; &fcy;&ocy;&rcy;&mcy;&acy;&tcy; &mdash; &ncy;&ocy;&lcy;&softcy; &icy;&lcy;&icy; &bcy;&ocy;&lcy;&iecy;&iecy; &zcy;&acy;&pcy;&icy;&scy;&iecy;&jcy; &scy; &icy;&ncy;&fcy;&ocy;&rcy;&mcy;&acy;&tscy;&icy;&iecy;&jcy; &ocy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&acy;&khcy;, &kcy;&acy;&zhcy;&dcy;&acy;&yacy; &icy;&zcy; &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&khcy; &icy;&mcy;&iecy;&iecy;&tcy; &vcy;&icy;&dcy;:</span></p> <div> <div> <pre class="hljs language-xml"><span class="hljs-tag">&lt;<span class="hljs-name">list-of-paths</span>&gt;</span><span class="hljs-tag">&lt;<span class="hljs-name">conflict-type</span>&gt;</span>NUL<span class="hljs-tag">&lt;<span class="hljs-name">conflict-message</span>&gt;</span>NUL</pre> </div> </div> <p><span data-i18n="727c34ea3fcfe1067d3507f347c2ed4034ba4383e1db3f41e16d26d97dad8f71/80" data-source="where &amp;lt;list-of-paths&amp;gt; is of the form" onmousemove="i18n(this)">&gcy;&dcy;&iecy; &lt;&scy;&pcy;&icy;&scy;&ocy;&kcy; &pcy;&ucy;&tcy;&iecy;&jcy;&gt; &icy;&mcy;&iecy;&iecy;&tcy; &fcy;&ocy;&rcy;&mcy;&ucy;</span></p> <div> <div> <pre class="hljs language-xml"><span class="hljs-tag">&lt;<span class="hljs-name">number-of-paths</span>&gt;</span>NUL<span class="hljs-tag">&lt;<span class="hljs-name">path1</span>&gt;</span>NUL<span class="hljs-tag">&lt;<span class="hljs-name">path2</span>&gt;</span>NUL...<span class="hljs-tag">&lt;<span class="hljs-name">pathN</span>&gt;</span>NUL</pre> </div> </div> <p><span data-i18n="066db6eb5f9964d7a8eb5fb68691b0707d65d46ee2b66ac25f4655b854dc2e9d/f3" data-source="and includes paths (or branch names) affected by the conflict or informational message in &amp;lt;conflict-message&amp;gt;. Also, &amp;lt;conflict-type&amp;gt; is a stable string explaining the type of conflict, such as" onmousemove="i18n(this)">&icy; &vcy;&kcy;&lcy;&yucy;&chcy;&acy;&iecy;&tcy; &pcy;&ucy;&tcy;&icy; (&icy;&lcy;&icy; &icy;&mcy;&iecy;&ncy;&acy; &vcy;&iecy;&tcy;&vcy;&iecy;&jcy;), &zcy;&acy;&tcy;&rcy;&ocy;&ncy;&ucy;&tcy;&ycy;&iecy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ocy;&mcy; &icy;&lcy;&icy; &icy;&ncy;&fcy;&ocy;&rcy;&mcy;&acy;&tscy;&icy;&ocy;&ncy;&ncy;&ycy;&mcy; &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&iecy;&mcy;, &vcy; &lt;conflict-message&gt;. &Kcy;&rcy;&ocy;&mcy;&iecy; &tcy;&ocy;&gcy;&ocy;, &lt;conflict-type&gt; &mdash; &ecy;&tcy;&ocy; &scy;&tcy;&acy;&bcy;&icy;&lcy;&softcy;&ncy;&acy;&yacy; &scy;&tcy;&rcy;&ocy;&kcy;&acy;, &ocy;&bcy;&hardcy;&yacy;&scy;&ncy;&yacy;&yucy;&shchcy;&acy;&yacy; &tcy;&icy;&pcy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&acy;, &ncy;&acy;&pcy;&rcy;&icy;&mcy;&iecy;&rcy;:</span></p> <div> <ul> <li> <p><span data-i18n="843440f35b48258938e09d741c243c53835f0490c056c775845361fb6e860c17/91" data-source="&amp;quot;Auto-merging&amp;quot;" onmousemove="i18n(this)">&quot;Auto-merging&quot;</span></p> </li> <li> <p><span data-i18n="2499b55ebd7d5c10143331b8e6b3fa273c177f5744211c4465ca5a2f7ef5d6c8/0a" data-source="&amp;quot;CONFLICT (rename/delete)&amp;quot;" onmousemove="i18n(this)">&quot;CONFLICT (rename/delete)&quot;</span></p> </li> <li> <p><span data-i18n="add89522dbb54eebcc8e613fb3669b147e462e1c94632267a944324acd6dfff4/39" data-source="&amp;quot;CONFLICT (submodule lacks merge base)&amp;quot;" onmousemove="i18n(this)">&quot;CONFLICT (submodule lacks merge base)&quot;</span></p> </li> <li> <p><span data-i18n="1109cbd40ca617a1d94112c519c1306b08210b19d979d5336ad0b912a88c3a7b/42" data-source="&amp;quot;CONFLICT (binary)&amp;quot;" onmousemove="i18n(this)">&quot;CONFLICT (binary)&quot;</span></p> </li> </ul> </div> <p><span data-i18n="9f390a5b82345eb4c7cd0182249d39fc0bb0deec63f22ca3e2a710be2cae6011/f4" data-source="and &amp;lt;conflict-message&amp;gt; is a more detailed message about the conflict which often (but not always) embeds the &amp;lt;stable-short-type-description&amp;gt; within it. These strings may change in future Git versions. Some examples:" onmousemove="i18n(this)">&acy; &lt;conflict-message&gt; &mdash; &ecy;&tcy;&ocy; &bcy;&ocy;&lcy;&iecy;&iecy; &pcy;&ocy;&dcy;&rcy;&ocy;&bcy;&ncy;&ocy;&iecy; &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&iecy; &ocy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&iecy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ocy;&iecy; &chcy;&acy;&scy;&tcy;&ocy; (&ncy;&ocy; &ncy;&iecy; &vcy;&scy;&iecy;&gcy;&dcy;&acy;) &vcy;&kcy;&lcy;&yucy;&chcy;&acy;&iecy;&tcy; &vcy; &scy;&iecy;&bcy;&yacy; &lt;stable-short-type-description&gt;. &Ecy;&tcy;&icy; &scy;&tcy;&rcy;&ocy;&kcy;&icy; &mcy;&ocy;&gcy;&ucy;&tcy; &icy;&zcy;&mcy;&iecy;&ncy;&icy;&tcy;&softcy;&scy;&yacy; &vcy; &bcy;&ucy;&dcy;&ucy;&shchcy;&icy;&khcy; &vcy;&iecy;&rcy;&scy;&icy;&yacy;&khcy;  Git . &Ncy;&iecy;&kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy; &pcy;&rcy;&icy;&mcy;&iecy;&rcy;&ycy;:</span></p> <div> <ul> <li> <p><span data-i18n="936049c8e3f70c7cdfd10aaecfebd4c062f81d6048fdd5a2800265982208d422/a5" data-source="&amp;quot;Auto-merging &amp;lt;file&amp;gt;&amp;quot;" onmousemove="i18n(this)">&quot;Auto-merging &lt;file&gt;&quot;</span></p> </li> <li> <p><span data-i18n="59d31ff1b3341491eefb9558103bc282a3f7d648af661807d21354081bbd2417/bb" data-source="&amp;quot;CONFLICT (rename/delete): &amp;lt;oldfile&amp;gt; renamed&amp;hellip;&amp;ZeroWidthSpace;but deleted in&amp;hellip;&amp;ZeroWidthSpace;&amp;quot;" onmousemove="i18n(this)">&quot;CONFLICT (rename/delete): &lt;oldfile&gt; renamed&hellip;&ZeroWidthSpace;but deleted in&hellip;&ZeroWidthSpace;&quot;</span></p> </li> <li> <p><span data-i18n="7082bd37c3eb6940132c2c27b01022ea8da78f8d7186c757fe7f4d80cb737fbf/1d" data-source="&amp;quot;Failed to merge submodule &amp;lt;submodule&amp;gt; (no merge base)&amp;quot;" onmousemove="i18n(this)">&quot;Failed to merge submodule &lt;submodule&gt; (no merge base)&quot;</span></p> </li> <li> <p><span data-i18n="cc19d80a0de26b4d58cd641b05e1cc49d8d602e0ace3daa5a071e24d8e26782f/6a" data-source="&amp;quot;Warning: cannot merge binary files: &amp;lt;filename&amp;gt;&amp;quot;" onmousemove="i18n(this)">&quot;Warning: cannot merge binary files: &lt;filename&gt;&quot;</span></p> </li> </ul> </div> <p><span data-i18n="1ea11a4f616ca8ada02b618428f2bf4293ba0e621e990ee068829ac28bc41120/b0" data-source="If &lt;code&gt;-z&lt;/code&gt; is NOT passed:" onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy;  <code>-z</code>  &Ncy;&IEcy; &pcy;&rcy;&ocy;&jcy;&dcy;&iecy;&ncy;:</span></p> <p><span data-i18n="b7af4132cc0e0ef6d5837e2cb62600b289033fb482dd44db138c63485fecfa0d/4a" data-source="This section starts with a blank line to separate it from the previous sections, and then only contains the &amp;lt;conflict-message&amp;gt; information from the previous section (separated by newlines). These are non-stable strings that should not be parsed by scripts, and are just meant for human consumption. Also, note that while &amp;lt;conflict-message&amp;gt; strings usually do not contain embedded newlines, they sometimes do. (However, the free-form messages will never have an embedded NUL character). So, the entire block of information is meant for human readers as an agglomeration of all conflict messages." onmousemove="i18n(this)">&Ecy;&tcy;&ocy;&tcy; &rcy;&acy;&zcy;&dcy;&iecy;&lcy; &ncy;&acy;&chcy;&icy;&ncy;&acy;&iecy;&tcy;&scy;&yacy; &scy; &pcy;&ucy;&scy;&tcy;&ocy;&jcy; &scy;&tcy;&rcy;&ocy;&kcy;&icy;, &chcy;&tcy;&ocy;&bcy;&ycy; &ocy;&tcy;&dcy;&iecy;&lcy;&icy;&tcy;&softcy; &iecy;&gcy;&ocy; &ocy;&tcy; &pcy;&rcy;&iecy;&dcy;&ycy;&dcy;&ucy;&shchcy;&icy;&khcy; &rcy;&acy;&zcy;&dcy;&iecy;&lcy;&ocy;&vcy;, &acy; &zcy;&acy;&tcy;&iecy;&mcy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&tcy; &tcy;&ocy;&lcy;&softcy;&kcy;&ocy; &icy;&ncy;&fcy;&ocy;&rcy;&mcy;&acy;&tscy;&icy;&yucy; &lt;conflict-message&gt; &icy;&zcy; &pcy;&rcy;&iecy;&dcy;&ycy;&dcy;&ucy;&shchcy;&iecy;&gcy;&ocy; &rcy;&acy;&zcy;&dcy;&iecy;&lcy;&acy; (&rcy;&acy;&zcy;&dcy;&iecy;&lcy;&iecy;&ncy;&ncy;&ucy;&yucy; &scy;&icy;&mcy;&vcy;&ocy;&lcy;&acy;&mcy;&icy; &ncy;&ocy;&vcy;&ocy;&jcy; &scy;&tcy;&rcy;&ocy;&kcy;&icy;). &Ecy;&tcy;&ocy; &ncy;&iecy;&scy;&tcy;&acy;&bcy;&icy;&lcy;&softcy;&ncy;&ycy;&iecy; &scy;&tcy;&rcy;&ocy;&kcy;&icy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy; &ncy;&iecy; &dcy;&ocy;&lcy;&zhcy;&ncy;&ycy; &acy;&ncy;&acy;&lcy;&icy;&zcy;&icy;&rcy;&ocy;&vcy;&acy;&tcy;&softcy;&scy;&yacy; &scy;&kcy;&rcy;&icy;&pcy;&tcy;&acy;&mcy;&icy; &icy; &pcy;&rcy;&iecy;&dcy;&ncy;&acy;&zcy;&ncy;&acy;&chcy;&iecy;&ncy;&ycy; &tcy;&ocy;&lcy;&softcy;&kcy;&ocy; &dcy;&lcy;&yacy; &pcy;&ocy;&tcy;&rcy;&iecy;&bcy;&lcy;&iecy;&ncy;&icy;&yacy; &chcy;&iecy;&lcy;&ocy;&vcy;&iecy;&kcy;&ocy;&mcy;. &Tcy;&acy;&kcy;&zhcy;&iecy; &ocy;&bcy;&rcy;&acy;&tcy;&icy;&tcy;&iecy; &vcy;&ncy;&icy;&mcy;&acy;&ncy;&icy;&iecy;, &chcy;&tcy;&ocy; &khcy;&ocy;&tcy;&yacy; &scy;&tcy;&rcy;&ocy;&kcy;&icy; &lt;conflict-message&gt; &ocy;&bcy;&ycy;&chcy;&ncy;&ocy; &ncy;&iecy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&acy;&tcy; &vcy;&scy;&tcy;&rcy;&ocy;&iecy;&ncy;&ncy;&ycy;&khcy; &scy;&icy;&mcy;&vcy;&ocy;&lcy;&ocy;&vcy; &ncy;&ocy;&vcy;&ocy;&jcy; &scy;&tcy;&rcy;&ocy;&kcy;&icy;, &icy;&ncy;&ocy;&gcy;&dcy;&acy; &ocy;&ncy;&icy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&acy;&tcy;. (&Ocy;&dcy;&ncy;&acy;&kcy;&ocy; &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&yacy; &vcy; &scy;&vcy;&ocy;&bcy;&ocy;&dcy;&ncy;&ocy;&jcy; &fcy;&ocy;&rcy;&mcy;&iecy; &ncy;&icy;&kcy;&ocy;&gcy;&dcy;&acy; &ncy;&iecy; &bcy;&ucy;&dcy;&ucy;&tcy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&acy;&tcy;&softcy; &vcy;&scy;&tcy;&rcy;&ocy;&iecy;&ncy;&ncy;&ycy;&jcy; NUL-&scy;&icy;&mcy;&vcy;&ocy;&lcy;). &Icy;&tcy;&acy;&kcy;, &vcy;&iecy;&scy;&softcy; &bcy;&lcy;&ocy;&kcy; &icy;&ncy;&fcy;&ocy;&rcy;&mcy;&acy;&tscy;&icy;&icy; &pcy;&rcy;&iecy;&dcy;&ncy;&acy;&zcy;&ncy;&acy;&chcy;&iecy;&ncy; &dcy;&lcy;&yacy; &chcy;&icy;&tcy;&acy;&tcy;&iecy;&lcy;&iecy;&jcy;-&lcy;&yucy;&dcy;&iecy;&jcy; &kcy;&acy;&kcy; &scy;&ocy;&vcy;&ocy;&kcy;&ucy;&pcy;&ncy;&ocy;&scy;&tcy;&softcy; &vcy;&scy;&iecy;&khcy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ncy;&ycy;&khcy; &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&jcy;.</span></p> </div> </div> <h2 class="text-body-emphasis"  id="_exit_status"><span data-i18n="f69b3d7f77a6dbe69851fce8d2fc115d844d8bbfb35250ad889373b3d4663ea2/e8" data-source="Exit status" onmousemove="i18n(this)">Exit status</span></h2> <div> <p><span data-i18n="b9a71b5650a75889bb560a64b8ac450eb047221906a9f1464d94bd74f36f1c56/e1" data-source="For a successful, non-conflicted merge, the exit status is 0. When the merge has conflicts, the exit status is 1. If the merge is not able to complete (or start) due to some kind of error, the exit status is something other than 0 or 1 (and the output is unspecified). When --stdin is passed, the return status is 0 for both successful and conflicted merges, and something other than 0 or 1 if it cannot complete all the requested merges." onmousemove="i18n(this)">&Dcy;&lcy;&yacy; &ucy;&scy;&pcy;&iecy;&shcy;&ncy;&ocy;&gcy;&ocy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &bcy;&iecy;&zcy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ocy;&vcy; &scy;&tcy;&acy;&tcy;&ucy;&scy; &vcy;&ycy;&khcy;&ocy;&dcy;&acy; &rcy;&acy;&vcy;&iecy;&ncy; 0. &IEcy;&scy;&lcy;&icy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&iecy; &icy;&mcy;&iecy;&iecy;&tcy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ycy;, &scy;&tcy;&acy;&tcy;&ucy;&scy; &vcy;&ycy;&khcy;&ocy;&dcy;&acy; &rcy;&acy;&vcy;&iecy;&ncy; 1. &IEcy;&scy;&lcy;&icy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&iecy; &ncy;&iecy; &mcy;&ocy;&zhcy;&iecy;&tcy; &bcy;&ycy;&tcy;&softcy; &zcy;&acy;&vcy;&iecy;&rcy;&shcy;&iecy;&ncy;&ocy; (&icy;&lcy;&icy; &zcy;&acy;&pcy;&ucy;&shchcy;&iecy;&ncy;&ocy;) &icy;&zcy;-&zcy;&acy; &kcy;&acy;&kcy;&ocy;&jcy;-&lcy;&icy;&bcy;&ocy; &ocy;&shcy;&icy;&bcy;&kcy;&icy;, &scy;&tcy;&acy;&tcy;&ucy;&scy; &vcy;&ycy;&khcy;&ocy;&dcy;&acy; &rcy;&acy;&vcy;&iecy;&ncy; 1. &chcy;&tcy;&ocy;-&tcy;&ocy; &ocy;&tcy;&lcy;&icy;&chcy;&ncy;&ocy;&iecy; &ocy;&tcy; 0 &icy;&lcy;&icy; 1 (&icy; &rcy;&iecy;&zcy;&ucy;&lcy;&softcy;&tcy;&acy;&tcy; &ncy;&iecy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;). &Kcy;&ocy;&gcy;&dcy;&acy; &pcy;&iecy;&rcy;&iecy;&dcy;&acy;&iecy;&tcy;&scy;&yacy; --stdin, &scy;&tcy;&acy;&tcy;&ucy;&scy; &vcy;&ocy;&zcy;&vcy;&rcy;&acy;&tcy;&acy; &rcy;&acy;&vcy;&iecy;&ncy; 0 &kcy;&acy;&kcy; &dcy;&lcy;&yacy; &ucy;&scy;&pcy;&iecy;&shcy;&ncy;&ycy;&khcy;, &tcy;&acy;&kcy; &icy; &dcy;&lcy;&yacy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ncy;&ycy;&khcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&jcy;, &acy; &tcy;&acy;&kcy;&zhcy;&iecy; &dcy;&lcy;&yacy; &dcy;&rcy;&ucy;&gcy;&icy;&khcy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&jcy;, &kcy;&rcy;&ocy;&mcy;&iecy; 0 &icy;&lcy;&icy; 1, &iecy;&scy;&lcy;&icy; &ncy;&iecy; &ucy;&dcy;&acy;&iecy;&tcy;&scy;&yacy; &zcy;&acy;&vcy;&iecy;&rcy;&shcy;&icy;&tcy;&softcy; &vcy;&scy;&iecy; &zcy;&acy;&pcy;&rcy;&ocy;&shcy;&iecy;&ncy;&ncy;&ycy;&iecy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;.</span></p> </div> <h2 class="text-body-emphasis"  id="_usage_notes"><span data-i18n="55d1762fe3bc53859c817100f417a0110ddffb177f0b94a8f571a0bb3f69b1e0/22" data-source="Usage notes" onmousemove="i18n(this)">Usage notes</span></h2> <div> <p><span data-i18n="ffe4173b7476b13baebb5809a617fd822ea021adb502c38ac77c8e9a1f23fcd2/31" data-source="This command is intended as low-level plumbing, similar to &lt;a href=&quot;git-hash-object&quot;&gt;git-hash-object[1]&lt;/a&gt;, &lt;a href=&quot;git-mktree&quot;&gt;git-mktree[1]&lt;/a&gt;, &lt;a href=&quot;git-commit-tree&quot;&gt;git-commit-tree[1]&lt;/a&gt;, &lt;a href=&quot;git-write-tree&quot;&gt;git-write-tree[1]&lt;/a&gt;, &lt;a href=&quot;git-update-ref&quot;&gt;git-update-ref[1]&lt;/a&gt;, and &lt;a href=&quot;git-mktag&quot;&gt;git-mktag[1]&lt;/a&gt;. Thus, it can be used as a part of a series of steps such as:" onmousemove="i18n(this)">&Ecy;&tcy;&acy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&acy; &pcy;&rcy;&iecy;&dcy;&ncy;&acy;&zcy;&ncy;&acy;&chcy;&iecy;&ncy;&acy; &dcy;&lcy;&yacy; &ncy;&icy;&zcy;&kcy;&ocy;&ucy;&rcy;&ocy;&vcy;&ncy;&iecy;&vcy;&ocy;&jcy; &scy;&acy;&ncy;&tcy;&iecy;&khcy;&ncy;&icy;&kcy;&icy;, &acy;&ncy;&acy;&lcy;&ocy;&gcy;&icy;&chcy;&ncy;&ocy;  <a href="git-hash-object.html">git-hash-object[1]</a> ,  <a href="git-mktree.html">git-mktree[1]</a> ,  <a href="git-commit-tree.html">git-commit-tree[1]</a> ,  <a href="git-write-tree.html">git-write-tree[1]</a> ,  <a href="git-update-ref.html">git-update-ref[1]</a>  &icy;  <a href="git-mktag.html">git-mktag[1]</a> . &Tcy;&acy;&kcy;&icy;&mcy; &ocy;&bcy;&rcy;&acy;&zcy;&ocy;&mcy;, &iecy;&gcy;&ocy; &mcy;&ocy;&zhcy;&ncy;&ocy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy; &kcy;&acy;&kcy; &chcy;&acy;&scy;&tcy;&softcy; &rcy;&yacy;&dcy;&acy; &shcy;&acy;&gcy;&ocy;&vcy;, &tcy;&acy;&kcy;&icy;&khcy; &kcy;&acy;&kcy;:</span></p> <div> <div> <pre class="hljs language-perl">NEWTREE=$(git merge-tree --<span class="hljs-keyword">write</span>-tree $BRANCH1 $BRANCH2)
test $? -eq <span class="hljs-number">0</span> || <span class="hljs-keyword">die</span> <span class="hljs-string">&quot;There were conflicts...&quot;</span>
NEWCOMMIT=$(git commit-tree $NEWTREE -p $BRANCH1 -p $BRANCH2)
git update-<span class="hljs-keyword">ref</span> $BRANCH1 $NEWCOMMIT</pre> </div> </div> <p><span data-i18n="6f69ac7a797994b698e7e15b8e28da4071d716922c4cafad095d107a488bc21d/de" data-source="Note that when the exit status is non-zero, &lt;code&gt;NEWTREE&lt;/code&gt; in this sequence will contain a lot more output than just a tree." onmousemove="i18n(this)">&Ocy;&bcy;&rcy;&acy;&tcy;&icy;&tcy;&iecy; &vcy;&ncy;&icy;&mcy;&acy;&ncy;&icy;&iecy;: &kcy;&ocy;&gcy;&dcy;&acy; &scy;&tcy;&acy;&tcy;&ucy;&scy; &vcy;&ycy;&khcy;&ocy;&dcy;&acy; &ncy;&iecy; &rcy;&acy;&vcy;&iecy;&ncy; &ncy;&ucy;&lcy;&yucy;,  <code>NEWTREE</code>  &vcy; &ecy;&tcy;&ocy;&jcy; &pcy;&ocy;&scy;&lcy;&iecy;&dcy;&ocy;&vcy;&acy;&tcy;&iecy;&lcy;&softcy;&ncy;&ocy;&scy;&tcy;&icy; &bcy;&ucy;&dcy;&iecy;&tcy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&acy;&tcy;&softcy; &gcy;&ocy;&rcy;&acy;&zcy;&dcy;&ocy; &bcy;&ocy;&lcy;&softcy;&shcy;&iecy; &vcy;&ycy;&khcy;&ocy;&dcy;&ncy;&ycy;&khcy; &dcy;&acy;&ncy;&ncy;&ycy;&khcy;, &chcy;&iecy;&mcy; &pcy;&rcy;&ocy;&scy;&tcy;&ocy; &dcy;&iecy;&rcy;&iecy;&vcy;&ocy;.</span></p> <p><span data-i18n="1e0d8337052f6e22f379116488dfe3d255777e7492833cf4eb301ed8ba503eef/a7" data-source="For conflicts, the output includes the same information that you&amp;rsquo;d get with &lt;a href=&quot;git-merge&quot;&gt;git-merge[1]&lt;/a&gt;:" onmousemove="i18n(this)">&Vcy; &scy;&lcy;&ucy;&chcy;&acy;&iecy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ocy;&vcy; &vcy;&ycy;&khcy;&ocy;&dcy;&ncy;&ycy;&iecy; &dcy;&acy;&ncy;&ncy;&ycy;&iecy; &vcy;&kcy;&lcy;&yucy;&chcy;&acy;&yucy;&tcy; &tcy;&ucy; &zhcy;&iecy; &icy;&ncy;&fcy;&ocy;&rcy;&mcy;&acy;&tscy;&icy;&yucy;, &chcy;&tcy;&ocy; &icy;  <a href="git-merge.html">git-merge[1]</a> :</span></p> <div> <ul> <li> <p><span data-i18n="71dbbe39e47a7de904bf86d13b53b0d5c0d029657300b624dba1af19c5ae70a6/87" data-source="what would be written to the working tree (the &lt;a href=&quot;#OIDTLT&quot;&gt;OID of toplevel tree&lt;/a&gt;)" onmousemove="i18n(this)">&chcy;&tcy;&ocy; &bcy;&ucy;&dcy;&iecy;&tcy; &zcy;&acy;&pcy;&icy;&scy;&acy;&ncy;&ocy; &vcy; &rcy;&acy;&bcy;&ocy;&chcy;&iecy;&iecy; &dcy;&iecy;&rcy;&iecy;&vcy;&ocy; ( <a href="git-merge-tree.html#OIDTLT">OID of toplevel tree</a> )</span></p> </li> <li> <p><span data-i18n="a52ee1f6f8435d1048b17f9cd5a605d3577a9739350da4755828e1d1bb480642/97" data-source="the higher order stages that would be written to the index (the &lt;a href=&quot;#CFI&quot;&gt;Conflicted file info&lt;/a&gt;)" onmousemove="i18n(this)">&ecy;&tcy;&acy;&pcy;&ycy; &bcy;&ocy;&lcy;&iecy;&iecy; &vcy;&ycy;&scy;&ocy;&kcy;&ocy;&gcy;&ocy; &pcy;&ocy;&rcy;&yacy;&dcy;&kcy;&acy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy; &bcy;&ucy;&dcy;&ucy;&tcy; &zcy;&acy;&pcy;&icy;&scy;&acy;&ncy;&ycy; &vcy; &icy;&ncy;&dcy;&iecy;&kcy;&scy; ( <a href="git-merge-tree.html#CFI">Conflicted file info</a> )</span></p> </li> <li> <p><span data-i18n="95a5a02028e3f8166fa8c33f19cfc1859fee7b035be9b232d1198f51e12fe35a/e9" data-source="any messages that would have been printed to stdout (the &lt;a href=&quot;#IM&quot;&gt;Informational messages&lt;/a&gt;)" onmousemove="i18n(this)">&lcy;&yucy;&bcy;&ycy;&iecy; &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&yacy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy; &bcy;&ycy;&lcy;&icy; &bcy;&ycy; &vcy;&ycy;&vcy;&iecy;&dcy;&iecy;&ncy;&ycy; &ncy;&acy; &scy;&tcy;&acy;&ncy;&dcy;&acy;&rcy;&tcy;&ncy;&ycy;&jcy; &vcy;&ycy;&vcy;&ocy;&dcy; ( <a href="git-merge-tree.html#IM">Informational messages</a> )</span></p> </li> </ul> </div> </div> <h2 class="text-body-emphasis"  id="_input_format"><span data-i18n="93c54b2c055528857ae0fc02da864c7374f0ce1b3186924dbc8aa36c9e5d744b/ea" data-source="Input format" onmousemove="i18n(this)">Input format</span></h2> <div> <p><span data-i18n="1c13b276e02c8243884337e46b13b50a08214192df2303bf610456bffbd48f24/4f" data-source="&lt;code&gt;git merge-tree --stdin&lt;/code&gt; input format is fully text based. Each line has this format:" onmousemove="i18n(this)">&Fcy;&ocy;&rcy;&mcy;&acy;&tcy; &vcy;&vcy;&ocy;&dcy;&acy;  <code>git merge-tree --stdin</code>  &pcy;&ocy;&lcy;&ncy;&ocy;&scy;&tcy;&softcy;&yucy; &tcy;&iecy;&kcy;&scy;&tcy;&ocy;&vcy;&ycy;&jcy;. &Kcy;&acy;&zhcy;&dcy;&acy;&yacy; &scy;&tcy;&rcy;&ocy;&kcy;&acy; &icy;&mcy;&iecy;&iecy;&tcy; &scy;&lcy;&iecy;&dcy;&ucy;&yucy;&shchcy;&icy;&jcy; &fcy;&ocy;&rcy;&mcy;&acy;&tcy;:</span></p> <div> <div> <pre class="hljs language-xml">[<span class="hljs-tag">&lt;<span class="hljs-name">base-commit</span>&gt;</span> -- ]<span class="hljs-tag">&lt;<span class="hljs-name">branch1</span>&gt;</span> <span class="hljs-tag">&lt;<span class="hljs-name">branch2</span>&gt;</span></pre> </div> </div> <p><span data-i18n="aeb16efd3c1283e57a31055d74cb24ea1792fc484862fc4212541dd0b56f9b59/34" data-source="If one line is separated by &lt;code&gt;--&lt;/code&gt;, the string before the separator is used for specifying a merge-base for the merge and the string after the separator describes the branches to be merged." onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &ocy;&dcy;&ncy;&acy; &scy;&tcy;&rcy;&ocy;&kcy;&acy; &rcy;&acy;&zcy;&dcy;&iecy;&lcy;&iecy;&ncy;&acy;  <code>--</code>  , &scy;&tcy;&rcy;&ocy;&kcy;&acy; &pcy;&iecy;&rcy;&iecy;&dcy; &rcy;&acy;&zcy;&dcy;&iecy;&lcy;&icy;&tcy;&iecy;&lcy;&iecy;&mcy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy;&scy;&yacy; &dcy;&lcy;&yacy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;&icy;&yacy; &bcy;&acy;&zcy;&ycy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &dcy;&lcy;&yacy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;, &acy; &scy;&tcy;&rcy;&ocy;&kcy;&acy; &pcy;&ocy;&scy;&lcy;&iecy; &rcy;&acy;&zcy;&dcy;&iecy;&lcy;&icy;&tcy;&iecy;&lcy;&yacy; &ocy;&pcy;&icy;&scy;&ycy;&vcy;&acy;&iecy;&tcy; &vcy;&iecy;&tcy;&kcy;&icy;, &pcy;&ocy;&dcy;&lcy;&iecy;&zhcy;&acy;&shchcy;&icy;&iecy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yucy;.</span></p> </div> <h2 class="text-body-emphasis"  id="_mistakes_to_avoid"><span data-i18n="181ab324cb3f46b00a18077fd8454add36774575152a49a1a9da8ded012ab2f7/af" data-source="Mistakes to avoid" onmousemove="i18n(this)">&Ocy;&shcy;&icy;&bcy;&kcy;&icy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&khcy; &scy;&lcy;&iecy;&dcy;&ucy;&iecy;&tcy; &icy;&zcy;&bcy;&iecy;&gcy;&acy;&tcy;&softcy;</span></h2> <div> <p><span data-i18n="0d2c981c949ce27ce995f533b0dff1c52d7bbce7ddb46b3d6fbec2e5c81ca7ef/7f" data-source="Do NOT look through the resulting toplevel tree to try to find which files conflict; parse the &lt;a href=&quot;#CFI&quot;&gt;Conflicted file info&lt;/a&gt; section instead. Not only would parsing an entire tree be horrendously slow in large repositories, there are numerous types of conflicts not representable by conflict markers (modify/delete, mode conflict, binary file changed on both sides, file/directory conflicts, various rename conflict permutations, etc.)" onmousemove="i18n(this)">&Ncy;&IEcy; &pcy;&rcy;&ocy;&scy;&mcy;&acy;&tcy;&rcy;&icy;&vcy;&acy;&jcy;&tcy;&iecy; &pcy;&ocy;&lcy;&ucy;&chcy;&iecy;&ncy;&ncy;&ocy;&iecy; &dcy;&iecy;&rcy;&iecy;&vcy;&ocy; &vcy;&iecy;&rcy;&khcy;&ncy;&iecy;&gcy;&ocy; &ucy;&rcy;&ocy;&vcy;&ncy;&yacy;, &chcy;&tcy;&ocy;&bcy;&ycy; &pcy;&ocy;&pcy;&ycy;&tcy;&acy;&tcy;&softcy;&scy;&yacy; &ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&icy;&tcy;&softcy;, &kcy;&acy;&kcy;&icy;&iecy; &fcy;&acy;&jcy;&lcy;&ycy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ucy;&yucy;&tcy;; &vcy;&mcy;&iecy;&scy;&tcy;&ocy; &ecy;&tcy;&ocy;&gcy;&ocy; &pcy;&rcy;&ocy;&acy;&ncy;&acy;&lcy;&icy;&zcy;&icy;&rcy;&ucy;&jcy;&tcy;&iecy; &rcy;&acy;&zcy;&dcy;&iecy;&lcy;  <a href="git-merge-tree.html#CFI">Conflicted file info</a> . &Mcy;&acy;&lcy;&ocy; &tcy;&ocy;&gcy;&ocy;, &chcy;&tcy;&ocy; &acy;&ncy;&acy;&lcy;&icy;&zcy; &vcy;&scy;&iecy;&gcy;&ocy; &dcy;&iecy;&rcy;&iecy;&vcy;&acy; &bcy;&ucy;&dcy;&iecy;&tcy; &ucy;&zhcy;&acy;&scy;&ncy;&ocy; &mcy;&iecy;&dcy;&lcy;&iecy;&ncy;&ncy;&ycy;&mcy; &vcy; &bcy;&ocy;&lcy;&softcy;&shcy;&icy;&khcy; &rcy;&iecy;&pcy;&ocy;&zcy;&icy;&tcy;&ocy;&rcy;&icy;&yacy;&khcy;, &scy;&ucy;&shchcy;&iecy;&scy;&tcy;&vcy;&ucy;&iecy;&tcy; &mcy;&ncy;&ocy;&zhcy;&iecy;&scy;&tcy;&vcy;&ocy; &tcy;&icy;&pcy;&ocy;&vcy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ocy;&vcy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy; &ncy;&iecy; &mcy;&ocy;&gcy;&ucy;&tcy; &bcy;&ycy;&tcy;&softcy; &pcy;&rcy;&iecy;&dcy;&scy;&tcy;&acy;&vcy;&lcy;&iecy;&ncy;&ycy; &mcy;&acy;&rcy;&kcy;&iecy;&rcy;&acy;&mcy;&icy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&acy; (&icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&iecy;/&ucy;&dcy;&acy;&lcy;&iecy;&ncy;&icy;&iecy;, &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy; &rcy;&iecy;&zhcy;&icy;&mcy;&ocy;&vcy;, &dcy;&vcy;&ocy;&icy;&chcy;&ncy;&ycy;&jcy; &fcy;&acy;&jcy;&lcy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy; &scy; &ocy;&bcy;&iecy;&icy;&khcy; &scy;&tcy;&ocy;&rcy;&ocy;&ncy;, &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ycy; &fcy;&acy;&jcy;&lcy;&ocy;&vcy;/&kcy;&acy;&tcy;&acy;&lcy;&ocy;&gcy;&ocy;&vcy;, &rcy;&acy;&zcy;&lcy;&icy;&chcy;&ncy;&ycy;&iecy; &vcy;&acy;&rcy;&icy;&acy;&ncy;&tcy;&ycy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ocy;&vcy; &pcy;&iecy;&rcy;&iecy;&icy;&mcy;&iecy;&ncy;&ocy;&vcy;&acy;&ncy;&icy;&yacy;, &icy; &tcy;. &dcy;.)</span></p> <p><span data-i18n="f1987ac7778cb0ee0db3102cf21b252bd60c19b923d6452999b94c1beca0fafa/3f" data-source="Do NOT interpret an empty &lt;a href=&quot;#CFI&quot;&gt;Conflicted file info&lt;/a&gt; list as a clean merge; check the exit status. A merge can have conflicts without having individual files conflict (there are a few types of directory rename conflicts that fall into this category, and others might also be added in the future)." onmousemove="i18n(this)">&Ncy;&IEcy; &icy;&ncy;&tcy;&iecy;&rcy;&pcy;&rcy;&iecy;&tcy;&icy;&rcy;&ucy;&jcy;&tcy;&iecy; &pcy;&ucy;&scy;&tcy;&ocy;&jcy; &scy;&pcy;&icy;&scy;&ocy;&kcy;  <a href="git-merge-tree.html#CFI">Conflicted file info</a>  &kcy;&acy;&kcy; &chcy;&icy;&scy;&tcy;&ocy;&iecy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&iecy;; &pcy;&rcy;&ocy;&vcy;&iecy;&rcy;&softcy;&tcy;&iecy; &scy;&tcy;&acy;&tcy;&ucy;&scy; &vcy;&ycy;&khcy;&ocy;&dcy;&acy;. &Scy;&lcy;&icy;&yacy;&ncy;&icy;&iecy; &mcy;&ocy;&zhcy;&iecy;&tcy; &icy;&mcy;&iecy;&tcy;&softcy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ycy; &bcy;&iecy;&zcy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ocy;&vcy; &ocy;&tcy;&dcy;&iecy;&lcy;&softcy;&ncy;&ycy;&khcy; &fcy;&acy;&jcy;&lcy;&ocy;&vcy; (&iecy;&scy;&tcy;&softcy; &ncy;&iecy;&scy;&kcy;&ocy;&lcy;&softcy;&kcy;&ocy; &tcy;&icy;&pcy;&ocy;&vcy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ocy;&vcy; &pcy;&iecy;&rcy;&iecy;&icy;&mcy;&iecy;&ncy;&ocy;&vcy;&acy;&ncy;&icy;&yacy; &kcy;&acy;&tcy;&acy;&lcy;&ocy;&gcy;&ocy;&vcy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy; &pcy;&ocy;&pcy;&acy;&dcy;&acy;&yucy;&tcy; &vcy; &ecy;&tcy;&ucy; &kcy;&acy;&tcy;&iecy;&gcy;&ocy;&rcy;&icy;&yucy;, &icy; &dcy;&rcy;&ucy;&gcy;&icy;&iecy; &tcy;&acy;&kcy;&zhcy;&iecy; &mcy;&ocy;&gcy;&ucy;&tcy; &bcy;&ycy;&tcy;&softcy; &dcy;&ocy;&bcy;&acy;&vcy;&lcy;&iecy;&ncy;&ycy; &vcy; &bcy;&ucy;&dcy;&ucy;&shchcy;&iecy;&mcy;).</span></p> <p><span data-i18n="2f2cb69716e9a17f3225482710529daa1f900206eb08bdb2ec745dacde639ad8/86" data-source="Do NOT attempt to guess or make the user guess the conflict types from the &lt;a href=&quot;#CFI&quot;&gt;Conflicted file info&lt;/a&gt; list. The information there is insufficient to do so. For example: Rename/rename(1to2) conflicts (both sides renamed the same file differently) will result in three different files having higher order stages (but each only has one higher order stage), with no way (short of the &lt;a href=&quot;#IM&quot;&gt;Informational messages&lt;/a&gt; section) to determine which three files are related. File/directory conflicts also result in a file with exactly one higher order stage. Possibly-involved-in-directory-rename conflicts (when &amp;quot;merge.directoryRenames&amp;quot; is unset or set to &amp;quot;conflicts&amp;quot;) also result in a file with exactly one higher order stage. In all cases, the &lt;a href=&quot;#IM&quot;&gt;Informational messages&lt;/a&gt; section has the necessary info, though it is not designed to be machine parseable." onmousemove="i18n(this)">&Ncy;&IEcy; &pcy;&ycy;&tcy;&acy;&jcy;&tcy;&iecy;&scy;&softcy; &ucy;&gcy;&acy;&dcy;&acy;&tcy;&softcy; &icy;&lcy;&icy; &zcy;&acy;&scy;&tcy;&acy;&vcy;&icy;&tcy;&softcy; &pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&iecy;&lcy;&yacy; &ucy;&gcy;&acy;&dcy;&acy;&tcy;&softcy; &tcy;&icy;&pcy;&ycy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ocy;&vcy; &icy;&zcy; &scy;&pcy;&icy;&scy;&kcy;&acy;  <a href="git-merge-tree.html#CFI">Conflicted file info</a> . &Icy;&ncy;&fcy;&ocy;&rcy;&mcy;&acy;&tscy;&icy;&icy; &dcy;&lcy;&yacy; &ecy;&tcy;&ocy;&gcy;&ocy; &ncy;&iecy;&dcy;&ocy;&scy;&tcy;&acy;&tcy;&ocy;&chcy;&ncy;&ocy;. &Ncy;&acy;&pcy;&rcy;&icy;&mcy;&iecy;&rcy;: &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ycy; &pcy;&iecy;&rcy;&iecy;&icy;&mcy;&iecy;&ncy;&ocy;&vcy;&acy;&ncy;&icy;&yacy;/&pcy;&iecy;&rcy;&iecy;&icy;&mcy;&iecy;&ncy;&ocy;&vcy;&acy;&ncy;&icy;&yacy; (1to2) (&ocy;&bcy;&iecy; &scy;&tcy;&ocy;&rcy;&ocy;&ncy;&ycy; &pcy;&iecy;&rcy;&iecy;&icy;&mcy;&iecy;&ncy;&ocy;&vcy;&ycy;&vcy;&acy;&yucy;&tcy; &ocy;&dcy;&icy;&ncy; &icy; &tcy;&ocy;&tcy; &zhcy;&iecy; &fcy;&acy;&jcy;&lcy; &pcy;&ocy;-&rcy;&acy;&zcy;&ncy;&ocy;&mcy;&ucy;) &pcy;&rcy;&icy;&vcy;&iecy;&dcy;&ucy;&tcy; &kcy; &tcy;&ocy;&mcy;&ucy;, &chcy;&tcy;&ocy; &tcy;&rcy;&icy; &rcy;&acy;&zcy;&ncy;&ycy;&khcy; &fcy;&acy;&jcy;&lcy;&acy; &bcy;&ucy;&dcy;&ucy;&tcy; &icy;&mcy;&iecy;&tcy;&softcy; &scy;&tcy;&acy;&dcy;&icy;&icy; &bcy;&ocy;&lcy;&iecy;&iecy; &vcy;&ycy;&scy;&ocy;&kcy;&ocy;&gcy;&ocy; &pcy;&ocy;&rcy;&yacy;&dcy;&kcy;&acy; (&ncy;&ocy; &kcy;&acy;&zhcy;&dcy;&ycy;&jcy; &icy;&mcy;&iecy;&iecy;&tcy; &tcy;&ocy;&lcy;&softcy;&kcy;&ocy; &ocy;&dcy;&ncy;&ucy; &scy;&tcy;&ucy;&pcy;&iecy;&ncy;&softcy; &bcy;&ocy;&lcy;&iecy;&iecy; &vcy;&ycy;&scy;&ocy;&kcy;&ocy;&gcy;&ocy; &pcy;&ocy;&rcy;&yacy;&dcy;&kcy;&acy;), &bcy;&iecy;&zcy; &vcy;&ocy;&zcy;&mcy;&ocy;&zhcy;&ncy;&ocy;&scy;&tcy;&icy; (&zcy;&acy; &icy;&scy;&kcy;&lcy;&yucy;&chcy;&iecy;&ncy;&icy;&iecy;&mcy; &rcy;&acy;&zcy;&dcy;&iecy;&lcy;&acy;  <a href="git-merge-tree.html#IM">Informational messages</a> ) &chcy;&tcy;&ocy;&bcy;&ycy; &ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&icy;&tcy;&softcy;, &kcy;&acy;&kcy;&icy;&iecy; &tcy;&rcy;&icy; &fcy;&acy;&jcy;&lcy;&acy; &scy;&vcy;&yacy;&zcy;&acy;&ncy;&ycy;. &Kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ycy; &fcy;&acy;&jcy;&lcy;&ocy;&vcy;/&kcy;&acy;&tcy;&acy;&lcy;&ocy;&gcy;&ocy;&vcy; &tcy;&acy;&kcy;&zhcy;&iecy; &pcy;&rcy;&icy;&vcy;&ocy;&dcy;&yacy;&tcy; &kcy; &tcy;&ocy;&mcy;&ucy;, &chcy;&tcy;&ocy; &fcy;&acy;&jcy;&lcy; &icy;&mcy;&iecy;&iecy;&tcy; &rcy;&ocy;&vcy;&ncy;&ocy; &ocy;&dcy;&ncy;&ucy; &scy;&tcy;&ucy;&pcy;&iecy;&ncy;&softcy; &bcy;&ocy;&lcy;&iecy;&iecy; &vcy;&ycy;&scy;&ocy;&kcy;&ocy;&gcy;&ocy; &pcy;&ocy;&rcy;&yacy;&dcy;&kcy;&acy;. &Vcy;&ocy;&zcy;&mcy;&ocy;&zhcy;&ncy;&ycy;&iecy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ycy; &pcy;&rcy;&icy; &pcy;&iecy;&rcy;&iecy;&icy;&mcy;&iecy;&ncy;&ocy;&vcy;&acy;&ncy;&icy;&icy; &kcy;&acy;&tcy;&acy;&lcy;&ocy;&gcy;&acy; (&kcy;&ocy;&gcy;&dcy;&acy;  &quot;merge.directoryRenames&quot;  &ncy;&iecy; &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy; &icy;&lcy;&icy; &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy; &ncy;&acy;  &quot;conflicts&quot; ) &tcy;&acy;&kcy;&zhcy;&iecy; &pcy;&rcy;&icy;&vcy;&ocy;&dcy;&yacy;&tcy; &kcy; &scy;&ocy;&zcy;&dcy;&acy;&ncy;&icy;&yucy; &fcy;&acy;&jcy;&lcy;&acy; &rcy;&ocy;&vcy;&ncy;&ocy; &scy; &ocy;&dcy;&ncy;&icy;&mcy; &ecy;&tcy;&acy;&pcy;&ocy;&mcy; &bcy;&ocy;&lcy;&iecy;&iecy; &vcy;&ycy;&scy;&ocy;&kcy;&ocy;&gcy;&ocy; &pcy;&ocy;&rcy;&yacy;&dcy;&kcy;&acy;. &Vcy;&ocy; &vcy;&scy;&iecy;&khcy; &scy;&lcy;&ucy;&chcy;&acy;&yacy;&khcy; &rcy;&acy;&zcy;&dcy;&iecy;&lcy;  <a href="git-merge-tree.html#IM">Informational messages</a>  &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&tcy; &ncy;&iecy;&ocy;&bcy;&khcy;&ocy;&dcy;&icy;&mcy;&ucy;&yucy; &icy;&ncy;&fcy;&ocy;&rcy;&mcy;&acy;&tscy;&icy;&yucy;, &khcy;&ocy;&tcy;&yacy; &ocy;&ncy; &ncy;&iecy; &pcy;&rcy;&iecy;&dcy;&ncy;&acy;&zcy;&ncy;&acy;&chcy;&iecy;&ncy; &dcy;&lcy;&yacy; &mcy;&acy;&shcy;&icy;&ncy;&ncy;&ocy;&gcy;&ocy; &acy;&ncy;&acy;&lcy;&icy;&zcy;&acy;.</span></p> <p><span data-i18n="3851504884fea182778c30d2c7a3d648818860d3a157bc6c8f0a1500a158b457/67" data-source="Do NOT assume that each path from &lt;a href=&quot;#CFI&quot;&gt;Conflicted file info&lt;/a&gt;, and the logical conflicts in the &lt;a href=&quot;#IM&quot;&gt;Informational messages&lt;/a&gt; have a one-to-one mapping, nor that there is a one-to-many mapping, nor a many-to-one mapping. Many-to-many mappings exist, meaning that each path can have many logical conflict types in a single merge, and each logical conflict type can affect many paths." onmousemove="i18n(this)">&Ncy;&IEcy; &pcy;&rcy;&iecy;&dcy;&pcy;&ocy;&lcy;&acy;&gcy;&acy;&jcy;&tcy;&iecy;, &chcy;&tcy;&ocy; &kcy;&acy;&zhcy;&dcy;&ycy;&jcy; &pcy;&ucy;&tcy;&softcy; &ocy;&tcy;  <a href="git-merge-tree.html#CFI">Conflicted file info</a>  &icy; &lcy;&ocy;&gcy;&icy;&chcy;&iecy;&scy;&kcy;&icy;&iecy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ycy; &vcy;  <a href="git-merge-tree.html#IM">Informational messages</a>  &icy;&mcy;&iecy;&yucy;&tcy; &scy;&ocy;&pcy;&ocy;&scy;&tcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&iecy; &laquo;&ocy;&dcy;&icy;&ncy; &kcy; &ocy;&dcy;&ncy;&ocy;&mcy;&ucy;&raquo;, &acy; &tcy;&acy;&kcy;&zhcy;&iecy; &chcy;&tcy;&ocy; &ncy;&iecy; &scy;&ucy;&shchcy;&iecy;&scy;&tcy;&vcy;&ucy;&iecy;&tcy; &scy;&ocy;&pcy;&ocy;&scy;&tcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&yacy; &laquo;&ocy;&dcy;&icy;&ncy; &kcy;&ocy; &mcy;&ncy;&ocy;&gcy;&icy;&mcy;&raquo; &icy;&lcy;&icy; &scy;&ocy;&pcy;&ocy;&scy;&tcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&yacy; &laquo;&mcy;&ncy;&ocy;&gcy;&icy;&iecy; &kcy; &ocy;&dcy;&ncy;&ocy;&mcy;&ucy;&raquo;. &Scy;&ucy;&shchcy;&iecy;&scy;&tcy;&vcy;&ucy;&yucy;&tcy; &scy;&ocy;&pcy;&ocy;&scy;&tcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&yacy; &laquo;&mcy;&ncy;&ocy;&gcy;&icy;&iecy; &kcy;&ocy; &mcy;&ncy;&ocy;&gcy;&icy;&mcy;&raquo;, &chcy;&tcy;&ocy; &ocy;&zcy;&ncy;&acy;&chcy;&acy;&iecy;&tcy;, &chcy;&tcy;&ocy; &kcy;&acy;&zhcy;&dcy;&ycy;&jcy; &pcy;&ucy;&tcy;&softcy; &mcy;&ocy;&zhcy;&iecy;&tcy; &icy;&mcy;&iecy;&tcy;&softcy; &mcy;&ncy;&ocy;&zhcy;&iecy;&scy;&tcy;&vcy;&ocy; &tcy;&icy;&pcy;&ocy;&vcy; &lcy;&ocy;&gcy;&icy;&chcy;&iecy;&scy;&kcy;&icy;&khcy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ocy;&vcy; &vcy; &ocy;&dcy;&ncy;&ocy;&mcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&icy;, &icy; &kcy;&acy;&zhcy;&dcy;&ycy;&jcy; &tcy;&icy;&pcy; &lcy;&ocy;&gcy;&icy;&chcy;&iecy;&scy;&kcy;&ocy;&gcy;&ocy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&acy; &mcy;&ocy;&zhcy;&iecy;&tcy; &vcy;&lcy;&icy;&yacy;&tcy;&softcy; &ncy;&acy; &mcy;&ncy;&ocy;&zhcy;&iecy;&scy;&tcy;&vcy;&ocy; &pcy;&ucy;&tcy;&iecy;&jcy;.</span></p> <p><span data-i18n="6c93f66cf75151285ef97019a2a2653ffd1e63afd2716bb499a1ed8ee82e254b/23" data-source="Do NOT assume all filenames listed in the &lt;a href=&quot;#IM&quot;&gt;Informational messages&lt;/a&gt; section had conflicts. Messages can be included for files that have no conflicts, such as &amp;quot;Auto-merging &amp;lt;file&amp;gt;&amp;quot;." onmousemove="i18n(this)">&Ncy;&IEcy; &pcy;&rcy;&iecy;&dcy;&pcy;&ocy;&lcy;&acy;&gcy;&acy;&jcy;&tcy;&iecy;, &chcy;&tcy;&ocy; &vcy;&scy;&iecy; &icy;&mcy;&iecy;&ncy;&acy; &fcy;&acy;&jcy;&lcy;&ocy;&vcy;, &pcy;&iecy;&rcy;&iecy;&chcy;&icy;&scy;&lcy;&iecy;&ncy;&ncy;&ycy;&iecy; &vcy; &rcy;&acy;&zcy;&dcy;&iecy;&lcy;&iecy;  <a href="git-merge-tree.html#IM">Informational messages</a> , &icy;&mcy;&iecy;&yucy;&tcy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ycy;. &Scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&yacy; &mcy;&ocy;&gcy;&ucy;&tcy; &bcy;&ycy;&tcy;&softcy; &vcy;&kcy;&lcy;&yucy;&chcy;&iecy;&ncy;&ycy; &dcy;&lcy;&yacy; &fcy;&acy;&jcy;&lcy;&ocy;&vcy;, &ucy; &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&khcy; &ncy;&iecy;&tcy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ocy;&vcy;, &ncy;&acy;&pcy;&rcy;&icy;&mcy;&iecy;&rcy;  &quot;Auto-merging &lt;file&gt;&quot; .</span></p> <p><span data-i18n="9ab7d1aecb8a4f1bce3059781595b57668d971f77699c167acbe8326940c8014/32" data-source="AVOID taking the OIDS from the &lt;a href=&quot;#CFI&quot;&gt;Conflicted file info&lt;/a&gt; and re-merging them to present the conflicts to the user. This will lose information. Instead, look up the version of the file found within the &lt;a href=&quot;#OIDTLT&quot;&gt;OID of toplevel tree&lt;/a&gt; and show that instead. In particular, the latter will have conflict markers annotated with the original branch/commit being merged and, if renames were involved, the original filename. While you could include the original branch/commit in the conflict marker annotations when re-merging, the original filename is not available from the &lt;a href=&quot;#CFI&quot;&gt;Conflicted file info&lt;/a&gt; and thus you would be losing information that might help the user resolve the conflict." onmousemove="i18n(this)">&Icy;&Zcy;&Bcy;&IEcy;&Gcy;&Acy;&Jcy;&Tcy;&IEcy; &bcy;&rcy;&acy;&tcy;&softcy; OIDS &icy;&zcy;  <a href="git-merge-tree.html#CFI">Conflicted file info</a>  &icy; &pcy;&ocy;&vcy;&tcy;&ocy;&rcy;&ncy;&ocy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&yacy;&tcy;&softcy; &icy;&khcy;, &chcy;&tcy;&ocy;&bcy;&ycy; &pcy;&rcy;&iecy;&dcy;&scy;&tcy;&acy;&vcy;&icy;&tcy;&softcy; &pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&iecy;&lcy;&yucy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ycy;. &Ecy;&tcy;&ocy; &pcy;&rcy;&icy;&vcy;&iecy;&dcy;&iecy;&tcy; &kcy; &pcy;&ocy;&tcy;&iecy;&rcy;&iecy; &icy;&ncy;&fcy;&ocy;&rcy;&mcy;&acy;&tscy;&icy;&icy;. &Vcy;&mcy;&iecy;&scy;&tcy;&ocy; &ecy;&tcy;&ocy;&gcy;&ocy; &ncy;&acy;&jcy;&dcy;&icy;&tcy;&iecy; &vcy;&iecy;&rcy;&scy;&icy;&yucy; &fcy;&acy;&jcy;&lcy;&acy;, &ncy;&acy;&jcy;&dcy;&iecy;&ncy;&ncy;&ucy;&yucy; &vcy;  <a href="git-merge-tree.html#OIDTLT">OID of toplevel tree</a> , &icy; &pcy;&ocy;&kcy;&acy;&zhcy;&icy;&tcy;&iecy; &iecy;&iecy;. &Vcy; &chcy;&acy;&scy;&tcy;&ncy;&ocy;&scy;&tcy;&icy;, &pcy;&ocy;&scy;&lcy;&iecy;&dcy;&ncy;&icy;&jcy; &bcy;&ucy;&dcy;&iecy;&tcy; &icy;&mcy;&iecy;&tcy;&softcy; &mcy;&acy;&rcy;&kcy;&iecy;&rcy;&ycy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&acy;, &acy;&ncy;&ncy;&ocy;&tcy;&icy;&rcy;&ocy;&vcy;&acy;&ncy;&ncy;&ycy;&iecy; &icy;&scy;&khcy;&ocy;&dcy;&ncy;&ocy;&jcy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&yacy;&iecy;&mcy;&ocy;&jcy; &vcy;&iecy;&tcy;&kcy;&ocy;&jcy;/&fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&iecy;&jcy;, &icy;, &iecy;&scy;&lcy;&icy; &bcy;&ycy;&lcy;&icy; &zcy;&acy;&dcy;&iecy;&jcy;&scy;&tcy;&vcy;&ocy;&vcy;&acy;&ncy;&ycy; &pcy;&iecy;&rcy;&iecy;&icy;&mcy;&iecy;&ncy;&ocy;&vcy;&acy;&ncy;&icy;&yacy;, &icy;&scy;&khcy;&ocy;&dcy;&ncy;&ycy;&mcy; &icy;&mcy;&iecy;&ncy;&iecy;&mcy; &fcy;&acy;&jcy;&lcy;&acy;. &KHcy;&ocy;&tcy;&yacy; &vcy;&ycy; &mcy;&ocy;&zhcy;&iecy;&tcy;&iecy; &vcy;&kcy;&lcy;&yucy;&chcy;&icy;&tcy;&softcy; &icy;&scy;&khcy;&ocy;&dcy;&ncy;&ucy;&yucy; &vcy;&iecy;&tcy;&vcy;&softcy;/&fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&yucy; &vcy; &acy;&ncy;&ncy;&ocy;&tcy;&acy;&tscy;&icy;&icy; &mcy;&acy;&rcy;&kcy;&iecy;&rcy;&acy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&acy; &pcy;&rcy;&icy; &pcy;&ocy;&vcy;&tcy;&ocy;&rcy;&ncy;&ocy;&mcy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&iecy;&ncy;&icy;&icy;, &icy;&scy;&khcy;&ocy;&dcy;&ncy;&ocy;&iecy; &icy;&mcy;&yacy; &fcy;&acy;&jcy;&lcy;&acy; &ncy;&iecy;&dcy;&ocy;&scy;&tcy;&ucy;&pcy;&ncy;&ocy; &vcy;  <a href="git-merge-tree.html#CFI">Conflicted file info</a> , &icy;, &tcy;&acy;&kcy;&icy;&mcy; &ocy;&bcy;&rcy;&acy;&zcy;&ocy;&mcy;, &vcy;&ycy; &pcy;&ocy;&tcy;&iecy;&rcy;&yacy;&iecy;&tcy;&iecy; &icy;&ncy;&fcy;&ocy;&rcy;&mcy;&acy;&tscy;&icy;&yucy;, &kcy;&ocy;&tcy;&ocy;&rcy;&acy;&yacy; &mcy;&ocy;&zhcy;&iecy;&tcy; &pcy;&ocy;&mcy;&ocy;&chcy;&softcy; &pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&iecy;&lcy;&yucy; &rcy;&acy;&zcy;&rcy;&iecy;&shcy;&icy;&tcy;&softcy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;.</span></p> </div> <h2 class="text-body-emphasis"  id="DEPMERGE"><span data-i18n="106c50e0e18f943702b36e68f651bb6cc76137f366b29cc40a1293a2c0a779c8/25" data-source="Deprecated description" onmousemove="i18n(this)">Deprecated description</span></h2> <div> <p><span data-i18n="26e3842d7578f40a9c4081828e6704d3821d3d3c75467824c6d8b59500d23f16/30" data-source="Per the &lt;a href=&quot;#NEWMERGE&quot;&gt;DESCRIPTION&lt;/a&gt; and unlike the rest of this documentation, this section describes the deprecated &lt;code&gt;--trivial-merge&lt;/code&gt; mode." onmousemove="i18n(this)">&Dcy;&lcy;&yacy;  <a href="git-merge-tree.html#NEWMERGE">DESCRIPTION</a> , &vcy; &ocy;&tcy;&lcy;&icy;&chcy;&icy;&iecy; &ocy;&tcy; &ocy;&scy;&tcy;&acy;&lcy;&softcy;&ncy;&ocy;&jcy; &chcy;&acy;&scy;&tcy;&icy; &dcy;&ocy;&kcy;&ucy;&mcy;&iecy;&ncy;&tcy;&acy;&tscy;&icy;&icy;, &vcy; &ecy;&tcy;&ocy;&mcy; &rcy;&acy;&zcy;&dcy;&iecy;&lcy;&iecy; &ocy;&pcy;&icy;&scy;&acy;&ncy; &ucy;&scy;&tcy;&acy;&rcy;&iecy;&vcy;&shcy;&icy;&jcy; &rcy;&iecy;&zhcy;&icy;&mcy;  <code>--trivial-merge</code> .</span></p> <p><span data-i18n="c2bfe51784c85acf44950f90195ca1e396e9439339ec92cb47248a142ee4636c/da" data-source="Other than the optional &lt;code&gt;--trivial-merge&lt;/code&gt;, this mode accepts no options." onmousemove="i18n(this)">&Zcy;&acy; &icy;&scy;&kcy;&lcy;&yucy;&chcy;&iecy;&ncy;&icy;&iecy;&mcy; &dcy;&ocy;&pcy;&ocy;&lcy;&ncy;&icy;&tcy;&iecy;&lcy;&softcy;&ncy;&ocy;&gcy;&ocy;  <code>--trivial-merge</code> , &ecy;&tcy;&ocy;&tcy; &rcy;&iecy;&zhcy;&icy;&mcy; &ncy;&iecy; &dcy;&ocy;&pcy;&ucy;&scy;&kcy;&acy;&iecy;&tcy; &ncy;&icy;&kcy;&acy;&kcy;&icy;&khcy; &ocy;&pcy;&tscy;&icy;&jcy;.</span></p> <p><span data-i18n="95e2cb9c12746470f9685c0704bbe8370d5da37f82c5f174b15e85a610868a59/bb" data-source="This mode reads three tree-ish, and outputs trivial merge results and conflicting stages to the standard output in a semi-diff format. Since this was designed for higher level scripts to consume and merge the results back into the index, it omits entries that match &amp;lt;branch1&amp;gt;. The result of this second form is similar to what three-way &lt;code&gt;git read-tree -m&lt;/code&gt; does, but instead of storing the results in the index, the command outputs the entries to the standard output." onmousemove="i18n(this)">&Ecy;&tcy;&ocy;&tcy; &rcy;&iecy;&zhcy;&icy;&mcy; &scy;&chcy;&icy;&tcy;&ycy;&vcy;&acy;&iecy;&tcy; &tcy;&rcy;&icy; &dcy;&rcy;&iecy;&vcy;&ocy;&vcy;&icy;&dcy;&ncy;&ycy;&khcy; &scy;&tcy;&rcy;&ucy;&kcy;&tcy;&ucy;&rcy;&ycy; &icy; &vcy;&ycy;&vcy;&ocy;&dcy;&icy;&tcy; &tcy;&rcy;&icy;&vcy;&icy;&acy;&lcy;&softcy;&ncy;&ycy;&iecy; &rcy;&iecy;&zcy;&ucy;&lcy;&softcy;&tcy;&acy;&tcy;&ycy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &icy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ucy;&yucy;&shchcy;&icy;&iecy; &ecy;&tcy;&acy;&pcy;&ycy; &ncy;&acy; &scy;&tcy;&acy;&ncy;&dcy;&acy;&rcy;&tcy;&ncy;&ycy;&jcy; &vcy;&ycy;&vcy;&ocy;&dcy; &vcy; &pcy;&ocy;&lcy;&ucy;&rcy;&acy;&zcy;&ncy;&ocy;&scy;&tcy;&ncy;&ocy;&mcy; &fcy;&ocy;&rcy;&mcy;&acy;&tcy;&iecy;. &Pcy;&ocy;&scy;&kcy;&ocy;&lcy;&softcy;&kcy;&ucy; &ecy;&tcy;&ocy; &bcy;&ycy;&lcy;&ocy; &rcy;&acy;&zcy;&rcy;&acy;&bcy;&ocy;&tcy;&acy;&ncy;&ocy; &dcy;&lcy;&yacy; &scy;&tscy;&iecy;&ncy;&acy;&rcy;&icy;&iecy;&vcy; &bcy;&ocy;&lcy;&iecy;&iecy; &vcy;&ycy;&scy;&ocy;&kcy;&ocy;&gcy;&ocy; &ucy;&rcy;&ocy;&vcy;&ncy;&yacy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy; &mcy;&ocy;&gcy;&lcy;&icy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy; &icy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&yacy;&tcy;&softcy; &rcy;&iecy;&zcy;&ucy;&lcy;&softcy;&tcy;&acy;&tcy;&ycy; &ocy;&bcy;&rcy;&acy;&tcy;&ncy;&ocy; &vcy; &icy;&ncy;&dcy;&iecy;&kcy;&scy;, &ocy;&ncy; &ocy;&pcy;&ucy;&scy;&kcy;&acy;&iecy;&tcy; &zcy;&acy;&pcy;&icy;&scy;&icy;, &scy;&ocy;&ocy;&tcy;&vcy;&iecy;&tcy;&scy;&tcy;&vcy;&ucy;&yucy;&shchcy;&icy;&iecy; &lt;branch1&gt;. &Rcy;&iecy;&zcy;&ucy;&lcy;&softcy;&tcy;&acy;&tcy; &ecy;&tcy;&ocy;&jcy; &vcy;&tcy;&ocy;&rcy;&ocy;&jcy; &fcy;&ocy;&rcy;&mcy;&ycy; &acy;&ncy;&acy;&lcy;&ocy;&gcy;&icy;&chcy;&iecy;&ncy; &tcy;&ocy;&mcy;&ucy;, &chcy;&tcy;&ocy; &dcy;&iecy;&lcy;&acy;&iecy;&tcy; &tcy;&rcy;&iecy;&khcy;&scy;&tcy;&ocy;&rcy;&ocy;&ncy;&ncy;&icy;&jcy;  <code>git read-tree -m</code> , &ncy;&ocy; &vcy;&mcy;&iecy;&scy;&tcy;&ocy; &scy;&ocy;&khcy;&rcy;&acy;&ncy;&iecy;&ncy;&icy;&yacy; &rcy;&iecy;&zcy;&ucy;&lcy;&softcy;&tcy;&acy;&tcy;&ocy;&vcy; &vcy; &icy;&ncy;&dcy;&iecy;&kcy;&scy;&iecy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&acy; &vcy;&ycy;&vcy;&ocy;&dcy;&icy;&tcy; &zcy;&acy;&pcy;&icy;&scy;&icy; &ncy;&acy; &scy;&tcy;&acy;&ncy;&dcy;&acy;&rcy;&tcy;&ncy;&ycy;&jcy; &vcy;&ycy;&vcy;&ocy;&dcy;.</span></p> <p><span data-i18n="7bcbec610a19d706445b5b9f0786b68d503a493acb61bde6b1597b987eb439f7/e8" data-source="This form not only has limited applicability (a trivial merge cannot handle content merges of individual files, rename detection, proper directory/file conflict handling, etc.), the output format is also difficult to work with, and it will generally be less performant than the first form even on successful merges (especially if working in large repositories)." onmousemove="i18n(this)">&Ecy;&tcy;&acy; &fcy;&ocy;&rcy;&mcy;&acy; &ncy;&iecy; &tcy;&ocy;&lcy;&softcy;&kcy;&ocy; &icy;&mcy;&iecy;&iecy;&tcy; &ocy;&gcy;&rcy;&acy;&ncy;&icy;&chcy;&iecy;&ncy;&ncy;&ucy;&yucy; &pcy;&rcy;&icy;&mcy;&iecy;&ncy;&icy;&mcy;&ocy;&scy;&tcy;&softcy; (&tcy;&rcy;&icy;&vcy;&icy;&acy;&lcy;&softcy;&ncy;&ocy;&iecy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&iecy; &ncy;&iecy; &mcy;&ocy;&zhcy;&iecy;&tcy; &ocy;&bcy;&rcy;&acy;&bcy;&acy;&tcy;&ycy;&vcy;&acy;&tcy;&softcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ocy;&gcy;&ocy; &ocy;&tcy;&dcy;&iecy;&lcy;&softcy;&ncy;&ycy;&khcy; &fcy;&acy;&jcy;&lcy;&ocy;&vcy;, &ocy;&bcy;&ncy;&acy;&rcy;&ucy;&zhcy;&iecy;&ncy;&icy;&iecy; &pcy;&iecy;&rcy;&iecy;&icy;&mcy;&iecy;&ncy;&ocy;&vcy;&acy;&ncy;&icy;&yacy;, &pcy;&rcy;&acy;&vcy;&icy;&lcy;&softcy;&ncy;&ucy;&yucy; &ocy;&bcy;&rcy;&acy;&bcy;&ocy;&tcy;&kcy;&ucy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ocy;&vcy; &kcy;&acy;&tcy;&acy;&lcy;&ocy;&gcy;&ocy;&vcy;/&fcy;&acy;&jcy;&lcy;&ocy;&vcy; &icy; &tcy;. &dcy;.), &scy; &vcy;&ycy;&khcy;&ocy;&dcy;&ncy;&ycy;&mcy; &fcy;&ocy;&rcy;&mcy;&acy;&tcy;&ocy;&mcy; &tcy;&acy;&kcy;&zhcy;&iecy; &scy;&lcy;&ocy;&zhcy;&ncy;&ocy; &rcy;&acy;&bcy;&ocy;&tcy;&acy;&tcy;&softcy;, &icy;, &kcy;&acy;&kcy; &pcy;&rcy;&acy;&vcy;&icy;&lcy;&ocy;, &ocy;&ncy; &bcy;&ucy;&dcy;&iecy;&tcy; &mcy;&iecy;&ncy;&iecy;&iecy; &pcy;&rcy;&ocy;&icy;&zcy;&vcy;&ocy;&dcy;&icy;&tcy;&iecy;&lcy;&softcy;&ncy;&ycy;&mcy;. &chcy;&iecy;&mcy; &pcy;&iecy;&rcy;&vcy;&acy;&yacy; &fcy;&ocy;&rcy;&mcy;&acy; &dcy;&acy;&zhcy;&iecy; &pcy;&rcy;&icy; &ucy;&scy;&pcy;&iecy;&shcy;&ncy;&ycy;&khcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;&khcy; (&ocy;&scy;&ocy;&bcy;&iecy;&ncy;&ncy;&ocy; &pcy;&rcy;&icy; &rcy;&acy;&bcy;&ocy;&tcy;&iecy; &vcy; &bcy;&ocy;&lcy;&softcy;&shcy;&icy;&khcy; &rcy;&iecy;&pcy;&ocy;&zcy;&icy;&tcy;&ocy;&rcy;&icy;&yacy;&khcy;).</span></p> </div><address>
<p>
    &copy; 2012&ndash;2024 Scott Chacon and others<br/>Licensed under the MIT License.<br/>
<a href="https://git-scm.com/docs/git-merge-tree">https://git-scm.com/docs/git-merge-tree</a>
</p>
</address>                </article>
            </main>

            <br>
            <br>
            <hr>

                            <ins class="adsbygoogle"
     style="display:block"
     data-ad-client="ca-pub-6424571640879890"
     data-ad-slot="3954319254"
     data-ad-format="auto"
     data-full-width-responsive="true"></ins>
<script>
     (adsbygoogle = window.adsbygoogle || []).push({});
</script>            
        </div>

        <!-- -->

        <div class="col-md-3">
            <br>
            <form action="-index-.html">
                <div class="input-group">
                    <input class="form-control" type="search" name="q" placeholder="Search for Git" required>
                    <button class="btn btn-primary" type="submit">
                        <i class="bi bi-search"></i>
                    </button>
                </div>
            </form>
            <br>

                            <div class="list-group list-group-flush">
                                            <a class="list-group-item list-group-item-action text-primary-emphasis px-2 text-truncate" href="git-mergetool.html">
                            git mergetool                        </a>
                                            <a class="list-group-item list-group-item-action text-primary-emphasis px-2 text-truncate" href="git-mktag.html">
                            git mktag                        </a>
                                            <a class="list-group-item list-group-item-action text-primary-emphasis px-2 text-truncate" href="git-mktree.html">
                            git mktree                        </a>
                                            <a class="list-group-item list-group-item-action text-primary-emphasis px-2 text-truncate" href="git-multi-pack-index.html">
                            git multi-pack-index                        </a>
                                            <a class="list-group-item list-group-item-action text-primary-emphasis px-2 text-truncate" href="git-mv.html">
                            git mv                        </a>
                                            <a class="list-group-item list-group-item-action text-primary-emphasis px-2 text-truncate" href="git-name-rev.html">
                            git name-rev                        </a>
                                            <a class="list-group-item list-group-item-action text-primary-emphasis px-2 text-truncate" href="git-notes.html">
                            git notes                        </a>
                                    </div>
            
            <br>
            <div class="my-3">
                   <ins class="adsbygoogle"
        style="display:block"
        data-ad-format="autorelaxed"
        data-ad-client="ca-pub-6424571640879890"
        data-ad-slot="7867651344"></ins>
   <script>
        (adsbygoogle = window.adsbygoogle || []).push({});
   </script>            </div>
            <br>

            
            
        </div>
    </div>
</div>    <!--/sse-->

    <footer>
        <br>
        <div class="container">
            <div class="row">
                <div class="col">
                    <hr>
                    <div class="row">
                        <div class="col-md-10">
                            <ul class="nav">
                                <li class="nav-item">
                                    <a class="nav-link ps-0" href="https://runebook.dev/">Help us Improve Translation</a>
                                </li>
                                                            </ul>
                        </div>
                        <div class="col-md-2 text-end">
                            <a href="git-merge-tree.html#" class="fs-5" aria-label="Top">
                                <i class="bi bi-arrow-up-square-fill"></i>
                            </a>
                        </div>
                    </div>
                </div>
            </div>
        </div>
        <br>
    </footer>
    <script src="../../../runebook.js"></script>
</body>

</html>